summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-28 16:55:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-28 16:57:22 +0200
commit13d54c7f7865346aeaa402843035526f8a2d5de2 (patch)
treefc2ddbefb847b778892e2360556b77e3d158f823
parent6ee412aa4801387990ea6250167616a1a0c87cd9 (diff)
update to rc1
-rw-r--r--package/xbmc/Makefile10
-rw-r--r--package/xbmc/patches/patch-Makefile_in10
2 files changed, 10 insertions, 10 deletions
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 19a808769..abb920ee6 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xbmc
-PKG_VERSION:= 13.0
+PKG_VERSION:= 13.1rc1
PKG_RELEASE:= 1
-PKG_MD5SUM:= be3e05d8b45328ae4950c456455936ab
+PKG_MD5SUM:= 1eb727c04cdc8282e9c2cb1f45ceeaae
PKG_DESCR:= software media player
PKG_SECTION:= multimedia
PKG_DEPENDS:= boost libffmpeg python2 libstdcxx
@@ -18,7 +18,7 @@ PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate
PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd
PKG_DEPENDS+= libbluray libgpg-error libudev python2-mod-sqlite
PKG_DEPENDS+= libssh libcec libnfs librtmp samba-lib libncurses
-PKG_DEPENDS+= libxslt libvorbisenc
+PKG_DEPENDS+= libxslt libvorbisenc alsa-lib glib
PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass
PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo libogg libvorbis libmodplug
PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl
@@ -27,7 +27,7 @@ PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd
PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump eudev
PKG_BUILDDEP+= libgpg-error libbluray dbus libxslt libvorbis
PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host
-PKG_BUILDDEP+= zip-host unzip-host
+PKG_BUILDDEP+= zip-host unzip-host alsa-lib glib
PKG_URL:= http://xbmc.org/
#PKG_SITES:= http://mirrors.xbmc.org/releases/source/
PKG_SITES:= http://openadk.org/distfiles/
@@ -39,7 +39,7 @@ PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40
PKG_LIBC_DEPENDS:= glibc
DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \
- aclocal.m4 config.h.in */Makefile.in
+ aclocal.m4 config.h.in
include $(TOPDIR)/mk/package.mk
diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in
index 8742f0f50..3ec03bfaf 100644
--- a/package/xbmc/patches/patch-Makefile_in
+++ b/package/xbmc/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
---- xbmc-13.0rc1.orig/Makefile.in 2014-04-30 15:45:06.000000000 +0200
-+++ xbmc-13.0rc1/Makefile.in 2014-05-03 15:31:00.000000000 +0200
-@@ -586,25 +586,6 @@ install-arch:
+--- xbmc-13.1rc1.orig/Makefile.in 2014-05-28 15:30:25.000000000 +0200
++++ xbmc-13.1rc1/Makefile.in 2014-05-28 16:05:22.772629085 +0200
+@@ -586,25 +586,7 @@ install-arch:
ifeq (@USE_PVR_ADDONS@,1)
$(MAKE) -C pvr-addons install
endif
@@ -20,13 +20,13 @@
- -exec install "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; \
- -exec printf " -- %-75.75s\r" "{}" \;
-else
-- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
+ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*" -iregex ".*\.so|.*\.vis|.*\.xbs|.*\.pvr" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
-endif
-endif
install-scripts:
@install -d $(DESTDIR)$(bindir)
-@@ -624,26 +605,7 @@ install-datas: install-scripts
+@@ -624,26 +606,7 @@ install-datas: install-scripts
@echo "Done!"
@echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc"
@install -d $(DESTDIR)$(datarootdir)/xbmc