diff options
| -rw-r--r-- | testing/xbmc/APKBUILD | 7 | ||||
| -rw-r--r-- | testing/xbmc/no-snesapu.patch | 46 |
2 files changed, 51 insertions, 2 deletions
diff --git a/testing/xbmc/APKBUILD b/testing/xbmc/APKBUILD index 9a262a00d..b07c79c53 100644 --- a/testing/xbmc/APKBUILD +++ b/testing/xbmc/APKBUILD @@ -5,7 +5,7 @@ pkgver=12_beta1 pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media" url="http://xbmc.org" -arch="x86_64" +arch="x86_64 x86" license="GPL" depends="python hicolor-icon-theme xdpyinfo libcrystalhd unrar mesa-demos curl" depends_dev="gettext-dev boost-dev mesa-dev glew-dev glu-dev mysql-dev libass-dev @@ -23,6 +23,7 @@ subpackages="$pkgname-dev $pkgname-doc" install="" options="ldpath-recursive" source="https://github.com/xbmc/xbmc/archive/Frodo_beta1.tar.gz + no-snesapu.patch xbmc-uclibc.patch" _pvr_addons="git://github.com/opdenkamp/xbmc-pvr-addons.git" @@ -38,17 +39,18 @@ prepare() { esac done #git clone $_pvr_addons pvr-addons || return 1 + ./bootstrap || return 1 } build() { cd "$_builddir" - ./bootstrap || return 1 ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ --disable-debug \ + --disable-ccache \ --enable-crystalhd \ --enable-vaapi \ --enable-ffmpeg-libvorbis \ @@ -69,4 +71,5 @@ package() { } md5sums="1d1d81073320cd8a270e1465b8f65a59 Frodo_beta1.tar.gz +5ad388f29ab8f4ca6bc9e2b73bf946ef no-snesapu.patch a089ae512a3e990ec85a78a4e79a29f5 xbmc-uclibc.patch" diff --git a/testing/xbmc/no-snesapu.patch b/testing/xbmc/no-snesapu.patch new file mode 100644 index 000000000..d49b273ab --- /dev/null +++ b/testing/xbmc/no-snesapu.patch @@ -0,0 +1,46 @@ +diff --git a/Makefile.in b/Makefile.in +index 31826b1..2f468e7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -168,7 +168,6 @@ PAPCODECS_DIRS= \ + lib/timidity \ + lib/libsidplay2 \ + lib/stsound/StSoundLibrary \ +- lib/snesapu/SNES/SNESAPU \ + lib/vgmstream + + ifeq (@USE_ASAP_CODEC@,1) +@@ -373,9 +372,6 @@ ifeq (@USE_ASAP_CODEC@,1) + endif + endif + $(MAKE) -C lib/stsound/StSoundLibrary +-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),) +- $(MAKE) -C lib/snesapu/SNES/SNESAPU +-endif + imagelib: dllloader + $(MAKE) -C lib/cximage-6.0 + +diff --git a/configure.in b/configure.in +index 538d9af..3f04545 100644 +--- a/configure.in ++++ b/configure.in +@@ -2348,7 +2348,6 @@ OUTPUT_FILES="Makefile \ + lib/nosefart/Makefile \ + lib/libsidplay2/Makefile \ + lib/vgmstream/Makefile \ +- lib/snesapu/SNES/SNESAPU/Makefile \ + lib/stsound/StSoundLibrary/Makefile \ + xbmc/cores/playercorefactory/Makefile \ + xbmc/music/karaoke/Makefile \ +diff --git a/xbmc/cores/paplayer/Makefile.in b/xbmc/cores/paplayer/Makefile.in +index 31cc8bd..a433e82 100644 +--- a/xbmc/cores/paplayer/Makefile.in ++++ b/xbmc/cores/paplayer/Makefile.in +@@ -31,7 +31,6 @@ SRCS += ASAPCodec.cpp + endif + + ifneq ($(ARCH), arm) +-CXXFLAGS += -DHAS_SPC_CODEC + SRCS += SPCCodec.cpp + endif + |