Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

2025-07-24 11:16:51 +00:00 · 2014-02-04 22:30:22 +01:00 · 2014-02-04 22:30:22 +01:00 · 14262cfad1
commit 14262cfad1
parent d1050c486f 6fc6264498
17 changed files with 36 additions and 20 deletions
--- a/5
+++ b/5
@ -3,8 +3,3 @@ ncurses-5.8/5.9:

 irserver:
  - rework irserver/init.d for systemd
-
-nettle/gmp
-  - ffmpeg shared build fails with gmp/nettle static (-fPIC?)
-    so try-build gmp/nettle as static-only libs once xbmc/ffmpeg 
-    is static linked and we drop ffmpeg package (or build it static)
--- a/config/path
+++ b/config/path
@ -51,7 +51,10 @@ SED="sed -i"
  PKG_LICENSE="unknown"
  PKG_SITE=""
  PKG_URL=""
-  PKG_DEPENDS=""
+  PKG_DEPENDS_TARGET=""
+  PKG_DEPENDS_HOST=""
+  PKG_DEPENDS_INIT=""
+  PKG_DEPENDS_BOOTSTRAP=""
  PKG_PRIORITY="optional"
  PKG_SECTION=""
  PKG_SHORTDESC="$1 (autogenerated)"
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@ -1,3 +1,5 @@
+4.1.4
+  enable hw pid filter by default
 4.1.3
  include driver bin/libs
 4.1.2
--- a/packages/addons/driver/sundtek-mediatv/package.mk
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@ -18,7 +18,7 @@

 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="4.1"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
--- a/packages/addons/driver/sundtek-mediatv/settings-default.xml
+++ b/packages/addons/driver/sundtek-mediatv/settings-default.xml
@ -1,7 +1,7 @@
 <settings>
  <setting id="SETTLE_TIME" value="0" />
  <setting id="RUN_USER_SCRIPT" value="false" />
-  <setting id="ENABLE_HW_PID_FILTER" value="false" />
+  <setting id="ENABLE_HW_PID_FILTER" value="true" />
  <setting id="ENABLE_IR_RECEIVER" value="false" />
  <setting id="LOWEST_ADAPTER_NUM" value="0" />
  <setting id="SUSPEND_DRIVER" value="true" />
--- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
@ -4,7 +4,7 @@
    <setting type="sep" />
    <setting id="SETTLE_TIME"          type="number" label="1014" default="0" />
    <setting id="RUN_USER_SCRIPT"      type="bool"   label="1015" default="false" />
-    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="false" />
+    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="true" />
    <setting id="ENABLE_IR_RECEIVER"   type="bool"   label="1035" default="false" />
    <setting id="LOWEST_ADAPTER_NUM"   type="number" label="1040" default="0" />
    <setting id="SUSPEND_DRIVER"       type="bool"   label="1050" default="true" />
--- a/packages/mediacenter/service.openelec.settings/package.mk
+++ b/packages/mediacenter/service.openelec.settings/package.mk
@ -24,7 +24,7 @@ PKG_LICENSE="prop."
 PKG_SITE="http://www.openelec.tv"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
 PKG_SOURCE_DIR="$PKG_NAME"
-PKG_DEPENDS_TARGET="toolchain Python connman"
+PKG_DEPENDS_TARGET="toolchain Python connman pygobject dbus-python"
 PKG_PRIORITY="optional"
 PKG_SECTION=""
 PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC"
@ -34,9 +34,9 @@ PKG_IS_ADDON="yes"
 PKG_AUTORECONF="no"

 if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS setxkbmap"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET setxkbmap"
 else
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS bkeymaps"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bkeymaps"
 fi

 make_target() {
--- a/packages/mediacenter/xbmc-pvr-addons/package.mk
+++ b/packages/mediacenter/xbmc-pvr-addons/package.mk
@ -32,7 +32,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 if [ "$MYSQL_SUPPORT" = yes ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS mysql"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql"
  PVRADDONS_MYSQL="--enable-mysql"
 else
  PVRADDONS_MYSQL="--disable-mysql"
--- a/packages/multimedia/libbluray/package.mk
+++ b/packages/multimedia/libbluray/package.mk
@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 if [ "$NONFREE_SUPPORT" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS libaacs"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs"
 fi

 PKG_CONFIGURE_OPTS_TARGET="--disable-werror \
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@ -68,6 +68,8 @@ pre_configure_target() {

 post_makeinstall_target() {
  rm -rf $INSTALL/lib/systemd
+  rm -rf $INSTALL/usr/bin/bccmd
+  rm -rf $INSTALL/usr/bin/bluemoon
  rm -rf $INSTALL/usr/bin/ciptool
 }

--- a/packages/network/connman/package.mk
+++ b/packages/network/connman/package.mk
@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
 PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz"
 # PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant ntp Python pygobject dbus-python"
+PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant ntp"
 PKG_PRIORITY="optional"
 PKG_SECTION="network"
 PKG_SHORTDESC="connman: Network manager daemon"
--- a/packages/security/nettle/patches/nettle-01_dont-build-subdirs.patch
+++ b/packages/security/nettle/patches/nettle-01_dont-build-subdirs.patch
@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2c25007..7980fa8 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -16,7 +16,7 @@ MKDIR_P = @MKDIR_P@
+ 
+ OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
+ 
+-SUBDIRS = tools testsuite examples
+SUBDIRS = 
+ 
+ include config.make
+ 
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 if [ "$HFSTOOLS" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS diskdev_cmds"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
 fi

 PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
--- a/packages/sysutils/lcdproc/package.mk
+++ b/packages/sysutils/lcdproc/package.mk
@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

 if [ "$IRSERVER_SUPPORT" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS irserver"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET irserver"
 fi

 PKG_CONFIGURE_OPTS_TARGET="--enable-libusb --enable-drivers=$LCD_DRIVER,!curses,!svga --enable-seamless-hbars"
--- a/packages/sysutils/pciutils/package.mk
+++ b/packages/sysutils/pciutils/package.mk
@ -61,6 +61,7 @@ post_makeinstall_target() {
  rm -rf $INSTALL/usr/bin/setpci
  rm -rf $INSTALL/usr/bin/update-pciids
  rm -rf $INSTALL/usr/share
+  rm -rf $INSTALL/usr/sbin/update-pciids

  mkdir -p $INSTALL/usr/share
    cp $PKG_DIR/config/pci.ids $INSTALL/usr/share
--- a/packages/tools/installer/package.mk
+++ b/packages/tools/installer/package.mk
@ -33,7 +33,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"

 if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS flashrom"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET flashrom"
 fi

 make_target() {
--- a/scripts/install
+++ b/scripts/install
@ -63,11 +63,11 @@ printf "%${BUILD_INDENT}c ${boldgreen}INSTALL${endcolor}    $PACKAGE_NAME ${bold
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))

 if [ "$TARGET" = target ] ; then
-  for p in $PKG_DEPENDS $PKG_DEPENDS_TARGET; do
+  for p in $PKG_DEPENDS_TARGET; do
    $SCRIPTS/install $p
  done
 elif [ "$TARGET" = init ] ; then
-  for p in $PKG_DEPENDS $PKG_DEPENDS_INIT; do
+  for p in $PKG_DEPENDS_INIT; do
    $SCRIPTS/install $p
  done
  INSTALL=$BUILD/initramfs