From 519c1e35d98fe165038234b0aa90ec955bc083d4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 10 Jul 2012 13:20:44 +0300 Subject: [PATCH 1/6] xbmc-*: add -crosscompile.patch --- .../xbmc-frodo-60b0903-999-crosscompile.patch | 23 +++++++++++++++++++ ...c-frodo-pvr-3486b24-999-crosscompile.patch | 23 +++++++++++++++++++ .../xbmc-11.0.1-999-crosscompile.patch | 23 +++++++++++++++++++ .../xbmc-pvr-11.0.1-999-crosscompile.patch | 23 +++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-60b0903-999-crosscompile.patch create mode 100644 packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-999-crosscompile.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.1-999-crosscompile.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999-crosscompile.patch diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-60b0903-999-crosscompile.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-60b0903-999-crosscompile.patch new file mode 100644 index 0000000000..9c73a9644e --- /dev/null +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-60b0903-999-crosscompile.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.include.in b/Makefile.include.in +index b70245d..0537b86 100644 +--- a/Makefile.include.in ++++ b/Makefile.include.in +@@ -1,4 +1,4 @@ +-AR=ar ++AR=@AR@ + ARFLAGS=crus + RM=rm -rf + SHELL=@SHELL@ +diff --git a/configure.in b/configure.in +index 7348529..baea8e0 100755 +--- a/configure.in ++++ b/configure.in +@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME], + AC_MSG_CHECKING([for lib$2 soname]) + $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') + if [[ ! -z $$1_FILENAME ]]; then +- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') ++ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') + fi + else + AC_MSG_CHECKING([for lib$2 dylib]) diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-999-crosscompile.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-999-crosscompile.patch new file mode 100644 index 0000000000..9c73a9644e --- /dev/null +++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-999-crosscompile.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.include.in b/Makefile.include.in +index b70245d..0537b86 100644 +--- a/Makefile.include.in ++++ b/Makefile.include.in +@@ -1,4 +1,4 @@ +-AR=ar ++AR=@AR@ + ARFLAGS=crus + RM=rm -rf + SHELL=@SHELL@ +diff --git a/configure.in b/configure.in +index 7348529..baea8e0 100755 +--- a/configure.in ++++ b/configure.in +@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME], + AC_MSG_CHECKING([for lib$2 soname]) + $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') + if [[ ! -z $$1_FILENAME ]]; then +- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') ++ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') + fi + else + AC_MSG_CHECKING([for lib$2 dylib]) diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999-crosscompile.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999-crosscompile.patch new file mode 100644 index 0000000000..9c73a9644e --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-999-crosscompile.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.include.in b/Makefile.include.in +index b70245d..0537b86 100644 +--- a/Makefile.include.in ++++ b/Makefile.include.in +@@ -1,4 +1,4 @@ +-AR=ar ++AR=@AR@ + ARFLAGS=crus + RM=rm -rf + SHELL=@SHELL@ +diff --git a/configure.in b/configure.in +index 7348529..baea8e0 100755 +--- a/configure.in ++++ b/configure.in +@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME], + AC_MSG_CHECKING([for lib$2 soname]) + $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') + if [[ ! -z $$1_FILENAME ]]; then +- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') ++ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') + fi + else + AC_MSG_CHECKING([for lib$2 dylib]) diff --git a/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999-crosscompile.patch b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999-crosscompile.patch new file mode 100644 index 0000000000..9c73a9644e --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-pvr-11.0.1-999-crosscompile.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.include.in b/Makefile.include.in +index b70245d..0537b86 100644 +--- a/Makefile.include.in ++++ b/Makefile.include.in +@@ -1,4 +1,4 @@ +-AR=ar ++AR=@AR@ + ARFLAGS=crus + RM=rm -rf + SHELL=@SHELL@ +diff --git a/configure.in b/configure.in +index 7348529..baea8e0 100755 +--- a/configure.in ++++ b/configure.in +@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME], + AC_MSG_CHECKING([for lib$2 soname]) + $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}') + if [[ ! -z $$1_FILENAME ]]; then +- $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') ++ $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}') + fi + else + AC_MSG_CHECKING([for lib$2 dylib]) From 1145cf9a38e36c9d80a517c4fa8494e3378f515a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 11 Jul 2012 13:02:43 +0300 Subject: [PATCH 2/6] makemkv: build depend on expat --- packages/addons/multimedia/makemkv/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta index 378c8e3510..c58ff45c1c 100644 --- a/packages/addons/multimedia/makemkv/meta +++ b/packages/addons/multimedia/makemkv/meta @@ -27,7 +27,7 @@ PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3" PKG_URL="http://www.makemkv.com/download/${PKG_NAME}-oss-${PKG_VERSION}.tar.gz" PKG_URL="$PKG_URL http://www.makemkv.com/download/${PKG_NAME}-bin-${PKG_VERSION}.tar.gz" PKG_DEPENDS="openssl" -PKG_BUILD_DEPENDS="toolchain openssl" +PKG_BUILD_DEPENDS="toolchain openssl expat" PKG_PRIORITY="optional" PKG_SECTION="lib/multimedia" PKG_SHORTDESC="MakeMKV converts the video clips from proprietary (and usually encrypted) disc into a set of MKV files, preserving most information but not changing it in any way." From 9ccc04a69c07e3247fb7256f6f6ac847ac5544fc Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 11 Jul 2012 15:30:31 +0300 Subject: [PATCH 3/6] xf86-video-virtualbox: fix build if ARCH not specified --- packages/x11/driver/xf86-video-virtualbox/meta | 2 +- packages/x11/driver/xf86-video-virtualbox/unpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-virtualbox/meta b/packages/x11/driver/xf86-video-virtualbox/meta index 89cee2deec..cf7c6daea8 100644 --- a/packages/x11/driver/xf86-video-virtualbox/meta +++ b/packages/x11/driver/xf86-video-virtualbox/meta @@ -24,7 +24,7 @@ PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.virtualbox.org" -PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${ARCH}.tar.bz2" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${TARGET_ARCH}.tar.bz2" PKG_DEPENDS="libXcomposite libXdamage libXfixes libXext libX11 libxcb libXau" PKG_BUILD_DEPENDS="toolchain" PKG_PRIORITY="optional" diff --git a/packages/x11/driver/xf86-video-virtualbox/unpack b/packages/x11/driver/xf86-video-virtualbox/unpack index 9157df0bb4..7d24ddc5e4 100755 --- a/packages/x11/driver/xf86-video-virtualbox/unpack +++ b/packages/x11/driver/xf86-video-virtualbox/unpack @@ -24,4 +24,4 @@ mkdir $BUILD/$PKG_NAME-$PKG_VERSION -tar jxpf $SOURCES/$1/$PKG_NAME-$PKG_VERSION-$ARCH.tar.bz2 -C $BUILD/$PKG_NAME-$PKG_VERSION +tar jxpf $SOURCES/$1/$PKG_NAME-$PKG_VERSION-$TARGET_ARCH.tar.bz2 -C $BUILD/$PKG_NAME-$PKG_VERSION From a70d45febb57db860323495ef2d3745448eb30c0 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 12 Jul 2012 16:13:01 +0300 Subject: [PATCH 4/6] oscam: update to oscam-7168 --- packages/addons/service/softcam/oscam/changelog.txt | 3 +++ packages/addons/service/softcam/oscam/meta | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt index 077422aead..94d205df14 100644 --- a/packages/addons/service/softcam/oscam/changelog.txt +++ b/packages/addons/service/softcam/oscam/changelog.txt @@ -1,3 +1,6 @@ +2.1.6 +- update to oscam-7168 + 2.1.5 - update to oscam-7038 - start userspace DVB drivers before oscam diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta index d25d20aa5e..9024d4bf15 100644 --- a/packages/addons/service/softcam/oscam/meta +++ b/packages/addons/service/softcam/oscam/meta @@ -20,8 +20,8 @@ ################################################################################ PKG_NAME="oscam" -PKG_VERSION="7038" -PKG_REV="5" +PKG_VERSION="7168" +PKG_REV="6" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en" From f5de25b9adc76815ec61796253521d1b4b9f00d9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 16 Jul 2012 16:41:24 +0300 Subject: [PATCH 5/6] connman: fallback to dhcp if ip address is set to 0.0.0.0 --- packages/network/connman/init.d/21_network | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index 211d2c0d87..27e9379fc1 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -96,7 +96,7 @@ fi fi # IP settings - if [ -z "$NET_IPADDRESS" ]; then + if [ -z "$NET_IPADDRESS" -o "$NET_IPADDRESS" = "0.0.0.0" ]; then echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE else echo "IPv4.method=manual" >> $CONNMAN_PROFILE @@ -157,7 +157,7 @@ fi fi # IP settings - if [ -z "$NET2_IPADDRESS" ]; then + if [ -z "$NET2_IPADDRESS" -o "$NET2_IPADDRESS" = "0.0.0.0" ]; then echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE else echo "IPv4.method=manual" >> $CONNMAN_PROFILE From 99a5cbbaf6b19d744399999072141733c7a784c4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 16 Jul 2012 22:07:13 +0300 Subject: [PATCH 6/6] xbmc-addon-settings: show only relevant options --- .../source/resources/settings.xml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index f9b0662d7b..cfac9bd349 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -27,17 +27,17 @@ - - - - - - - - + + + + + + + + - - + + @@ -45,21 +45,21 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + @@ -67,8 +67,8 @@ - - - + + +