Merge remote-tracking branch 'upstream/master'

Conflicts: packages/linux/package.mk
codesnake · Jan 2, 2015 · e2cb0d9 · e2cb0d9
2 parents 44b3880 + eab1154
commit e2cb0d9
Show file tree

Hide file tree

Showing 55 changed files with 1,743 additions and 3,668 deletions.
diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk
@@ -24,7 +24,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -48,9 +48,10 @@ addon() {
   VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
   VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
   VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
+  VDR_PLUGIN_EPGFIXER_DIR="$(get_build_dir vdr-plugin-epgfixer)"
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
-  cp $VDR_DIR/channels.conf $ADDON_BUILD/$PKG_ADDON_ID/config
+  touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf
   cp $VDR_DIR/diseqc.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/keymacros.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/scr.conf $ADDON_BUILD/$PKG_ADDON_ID/config
@@ -84,6 +85,7 @@ addon() {
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-satip)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
 
@@ -103,4 +105,7 @@ addon() {
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
+  cp -PR $VDR_PLUGIN_EPGFIXER_DIR/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
 }
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -105,6 +105,9 @@ fi
 if [ "$ENABLE_EEPG" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P eepg"
 fi
+if [ "$ENABLE_EPGFIXER" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P epgfixer"
+fi
 if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P epgsearch"
 fi

diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
@@ -24,6 +24,7 @@
 	<string id="1046">Enable plugin: extended EPG</string>
 	<string id="1047">Enable plugin: dummydevice</string>
 	<string id="1048">Enable plugin: satip</string>
+	<string id="1049">Enable plugin: epgfixer</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
 	<string id="1053">PVR plugin</string>

diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -35,6 +35,7 @@
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting id="ENABLE_DUMMYDEVICE" type="bool" label="1047" default="false" />
 		<setting id="ENABLE_SATIP" type="bool" label="1048" default="false" />
+		<setting id="ENABLE_EPGFIXER" type="bool" label="1049" default="false" />
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
     </category>

diff --git a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
@@ -14,6 +14,7 @@
     <setting id="ENABLE_CONTROL" value="false" />
     <setting id="CONTROL_PORT" value="2002" />
     <setting id="ENABLE_EEPG" value="false" />
+    <setting id="ENABLE_EPGFIXER" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
     <setting id="ENABLE_XMLTV2VDR" value="false" />
     <setting id="ENABLE_DUMMYDEVICE" value="false" />

diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.zlib.net"
-PKG_URL="http://www.zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_MIRROR/zlib/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST=""
 PKG_PRIORITY="optional"

diff --git a/packages/debug/vdpauinfo/package.mk b/packages/debug/vdpauinfo/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="vdpauinfo"
-PKG_VERSION="0.1"
+PKG_VERSION="0.9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="binutils"
-PKG_VERSION="2.24"
+PKG_VERSION="2.25"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/devel/binutils/patches/binutils-2.24-ARM_LTO.patch b/packages/devel/binutils/patches/binutils-2.24-ARM_LTO.patch
diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="boost"
-PKG_VERSION="1_56_0"
+PKG_VERSION="1_57_0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

diff --git a/packages/devel/gettext/package.mk b/packages/devel/gettext/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gettext"
-PKG_VERSION="0.19.3"
+PKG_VERSION="0.19.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/ncurses/"
 PKG_URL="http://ftp.gnu.org/pub/gnu/ncurses/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="ncurses: The ncurses (new curses) library"

diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="5f1b910"
+PKG_VERSION="2f9828c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

diff --git a/packages/graphics/libpng/package.mk b/packages/graphics/libpng/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.15"
+PKG_VERSION="1.6.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -149,7 +149,7 @@ make_target() {
     $SCRIPTS/install initramfs
   )
 
-  if [ -n "$KERNEL_UBOOT_EXTRA_TARGET" ]; then
+  if [ "$BOOTLOADER" = "u-boot" -a -n "$KERNEL_UBOOT_EXTRA_TARGET" ]; then
     for extra_target in "$KERNEL_UBOOT_EXTRA_TARGET"; do
       LDFLAGS="" make $extra_target
     done