Merge tag '6.95.3' into openelec-7.0

Conflicts: config/version packages/devel/libcec/patches/libcec-03-amlogic-support.patch packages/linux-drivers/mt7610u/package.mk
kszaq · May 19, 2016 · 407abf3 · 407abf3
2 parents 5095f2f + 9445c7a
commit 407abf3
Show file tree

Hide file tree

Showing 309 changed files with 6,722 additions and 331,855 deletions.
diff --git a/config/arch.aarch64 b/config/arch.aarch64
@@ -4,27 +4,13 @@
   fi
 
 # TARGET_CPU:
-# arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
-# arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c arm7100
-# arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t arm720t
-# arm740t strongarm strongarm110 strongarm1100 strongarm1110 arm8
-# arm810 arm9 arm9e arm920 arm920t arm922t arm946e-s arm966e-s
-# arm968e-s arm926ej-s arm940t arm9tdmi arm10tdmi arm1020t
-# arm1026ej-s arm10e arm1020e arm1022e arm1136j-s arm1136jf-s
-# mpcore mpcorenovfp arm1156t2-s arm1156t2f-s arm1176jz-s
-# arm1176jzf-s generic-armv7-a cortex-a5 cortex-a7 cortex-a8
-# cortex-a9 cortex-a12 cortex-a15 cortex-a17 cortex-a53
-# cortex-a57 cortex-a72 cortex-r4 cortex-r4f cortex-r5 cortex-r7
-# cortex-m7 cortex-m4 cortex-m3 cortex-m1 cortex-m0 cortex-m0plus
-# cortex-m1.small-multiply cortex-m0.small-multiply
-# cortex-m0plus.small-multiply exynos-m1 qdf24xx marvell-pj4
-# xscale iwmmxt iwmmxt2 ep9312 fa526 fa626 fa606te fa626te fmp626
-# fa726te xgene1 cortex-a15.cortex-a7 cortex-a17.cortex-a7
-# cortex-a57.cortex-a53 cortex-a72.cortex-a53
+# generic cortex-a35 cortex-a53 cortex-a57 cortex-a72
+# exynos-m1 qdf24xx thunderx xgene1 cortex-a57.cortex-a53
+# cortex-a72.cortex-a53
 
 # determine architecture's family
   case $TARGET_CPU in
-    cortex-a53)
+    generic|cortex-a35|cortex-a53|cortex-a57|cortex-a72|exynos-m1|qdf24xx|thunderx|xgene1|cortex-a57.cortex-a53|cortex-a72.cortex-a53)
       TARGET_SUBARCH=aarch64
       TARGET_VARIANT=armv8-a
       TARGET_ABI=eabi
@@ -34,7 +20,7 @@
       ;;
   esac
 
-  TARGET_GCC_ARCH=$(echo $TARGET_SUBARCH | sed -e "s,-,,")
+  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
   TARGET_KERNEL_ARCH=arm64
 
 # setup ARCH specific *FLAGS

diff --git a/config/arch.arm b/config/arch.arm
@@ -31,7 +31,7 @@
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       SIMD_SUPPORT="no"
       ;;
-    cortex-a7|cortex-a15)
+    cortex-a7|cortex-a15|cortex-a15.cortex-a7|cortex-a17.cortex-a7)
       TARGET_SUBARCH=armv7ve
       TARGET_ABI=eabi
       TARGET_EXTRA_FLAGS="-mcpu=$TARGET_CPU"
@@ -47,7 +47,7 @@
       ;;
   esac
 
-  TARGET_GCC_ARCH=$(echo $TARGET_SUBARCH | sed -e "s,-,,")
+  TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
   TARGET_KERNEL_ARCH=arm
 
 # setup ARCH specific *FLAGS

diff --git a/config/path b/config/path
@@ -167,8 +167,6 @@ XORG_PATH_RGB=/usr/lib/X11/rgb
 XORG_PATH_MODULES=/usr/lib/xorg/modules
 XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 
-SSL_CERTIFICATES="/etc/ssl"
-
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 

diff --git a/config/version b/config/version
@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="6.95.2.3"
+  OPENELEC_VERSION="6.95.3"
 
 # OS_VERSION: OS Version
   OS_VERSION="7.0"

diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options
@@ -139,7 +139,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
-  GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia nvidia-legacy"
+  GRAPHIC_DRIVERS="r200 r300 r600 radeonsi i915 i965 nvidia nvidia-legacy"
 
 # build and install remote support (yes / no)
   REMOTE_SUPPORT="yes"

diff --git a/packages/audio/flac/package.mk → ...ages/addons/depends/audio/flac/package.mk b/packages/audio/flac/package.mk → ...ages/addons/depends/audio/flac/package.mk
diff --git a/...audio/flac/patches/flac-1.3.1-debug.patch → ...audio/flac/patches/flac-1.3.1-debug.patch b/...audio/flac/patches/flac-1.3.1-debug.patch → ...audio/flac/patches/flac-1.3.1-debug.patch
diff --git a/packages/audio/libogg/package.mk → ...es/addons/depends/audio/libogg/package.mk b/packages/audio/libogg/package.mk → ...es/addons/depends/audio/libogg/package.mk
@@ -31,3 +31,5 @@ PKG_LONGDESC="Libogg contains necessary functionality to create, decode, and wor
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
diff --git a/packages/audio/libvorbis/package.mk → ...addons/depends/audio/libvorbis/package.mk b/packages/audio/libvorbis/package.mk → ...addons/depends/audio/libvorbis/package.mk
@@ -33,4 +33,8 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
 # package specific configure options
-PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr --disable-oggtest --disable-docs --disable-examples"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
+                           --with-ogg=$SYSROOT_PREFIX/usr \
+                           --disable-oggtest \
+                           --disable-docs \
+                           --disable-examples"
diff --git a/...s/patches/libvorbis-1.3.3-configure.patch → ...s/patches/libvorbis-1.3.3-configure.patch b/...s/patches/libvorbis-1.3.3-configure.patch → ...s/patches/libvorbis-1.3.3-configure.patch
diff --git a/packages/addons/depends/graphics/libprojectM/patches/libprojectM-04-fix-pkgconfig.patch.old b/packages/addons/depends/graphics/libprojectM/patches/libprojectM-04-fix-pkgconfig.patch.old
diff --git a/packages/addons/depends/multimedia/vdr-plugin-dvbapi/package.mk b/packages/addons/depends/multimedia/vdr-plugin-dvbapi/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi"
-PKG_GIT_URL="git://github.com/manio/vdr-plugin-dvbapi.git"
+PKG_GIT_URL="https://github.com/manio/vdr-plugin-dvbapi.git"
 PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa"
 PKG_PRIORITY="optional"

diff --git a/packages/addons/depends/multimedia/vdr-plugin-eepg/package.mk b/packages/addons/depends/multimedia/vdr-plugin-eepg/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg"
-PKG_GIT_URL="git://projects.vdr-developer.org/vdr-plugin-eepg.git"
+PKG_GIT_URL="https://projects.vdr-developer.org/git/vdr-plugin-eepg.git"
 PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"

diff --git a/packages/addons/depends/multimedia/vdr-plugin-epgfixer/package.mk b/packages/addons/depends/multimedia/vdr-plugin-epgfixer/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-epgfixer"
-PKG_GIT_URL="git://projects.vdr-developer.org/vdr-plugin-epgfixer.git"
+PKG_GIT_URL="https://projects.vdr-developer.org/git/vdr-plugin-epgfixer.git"
 PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain vdr pcre"
 PKG_PRIORITY="optional"

diff --git a/packages/addons/depends/multimedia/vdr-plugin-epgsearch/package.mk b/packages/addons/depends/multimedia/vdr-plugin-epgsearch/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://winni.vdr-developer.org/epgsearch/"
-PKG_GIT_URL="git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"
+PKG_GIT_URL="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git"
 PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"

diff --git a/packages/addons/depends/multimedia/vdr-plugin-streamdev/package.mk b/packages/addons/depends/multimedia/vdr-plugin-streamdev/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev"
-PKG_GIT_URL="git://projects.vdr-developer.org/vdr-plugin-streamdev.git"
+PKG_GIT_URL="https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git"
 PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain vdr libressl"
 PKG_PRIORITY="optional"

diff --git a/packages/addons/depends/multimedia/vdr-plugin-vnsiserver/package.mk b/packages/addons/depends/multimedia/vdr-plugin-vnsiserver/package.mk
@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
-PKG_GIT_URL="git://github.com/FernetMenta/vdr-plugin-vnsiserver"
+PKG_GIT_URL="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
 PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain vdr"
 PKG_PRIORITY="optional"

diff --git a/packages/addons/official/kodi-addons/pvr.argustv/package.mk b/packages/addons/official/kodi-addons/pvr.argustv/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.argustv"
-PKG_VERSION="654715b"
+PKG_VERSION="d6d7ca9"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.dvblink/package.mk b/packages/addons/official/kodi-addons/pvr.dvblink/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvblink"
-PKG_VERSION="4669fb3"
+PKG_VERSION="03c62ba"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.dvbviewer/package.mk b/packages/addons/official/kodi-addons/pvr.dvbviewer/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.dvbviewer"
-PKG_VERSION="21423d4"
+PKG_VERSION="1a7e3c3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.hdhomerun/package.mk b/packages/addons/official/kodi-addons/pvr.hdhomerun/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.hdhomerun"
-PKG_VERSION="ae94e4c"
+PKG_VERSION="154896a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.hts/package.mk b/packages/addons/official/kodi-addons/pvr.hts/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.hts"
-PKG_VERSION="3c673b5"
+PKG_VERSION="7a3b3a3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.mediaportal.tvserver/package.mk b/packages/addons/official/kodi-addons/pvr.mediaportal.tvserver/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="07f83a0"
+PKG_VERSION="9c64ead"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.mythtv/package.mk b/packages/addons/official/kodi-addons/pvr.mythtv/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.mythtv"
-PKG_VERSION="5b21931"
+PKG_VERSION="fd91be1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.nextpvr/package.mk b/packages/addons/official/kodi-addons/pvr.nextpvr/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="e1aabb9"
+PKG_VERSION="cdc777c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.pctv/package.mk b/packages/addons/official/kodi-addons/pvr.pctv/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.pctv"
-PKG_VERSION="0096770"
+PKG_VERSION="e80218f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.stalker/package.mk b/packages/addons/official/kodi-addons/pvr.stalker/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.stalker"
-PKG_VERSION="72a064a"
+PKG_VERSION="08986b0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.vbox/package.mk b/packages/addons/official/kodi-addons/pvr.vbox/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vbox"
-PKG_VERSION="15e864d"
+PKG_VERSION="ee06261"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.vdr.vnsi/package.mk b/packages/addons/official/kodi-addons/pvr.vdr.vnsi/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vdr.vnsi"
-PKG_VERSION="76652c2"
+PKG_VERSION="8676377"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.vuplus/package.mk b/packages/addons/official/kodi-addons/pvr.vuplus/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.vuplus"
-PKG_VERSION="815ea2f"
+PKG_VERSION="05c9ce2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/pvr.wmc/package.mk b/packages/addons/official/kodi-addons/pvr.wmc/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="pvr.wmc"
-PKG_VERSION="1302f58"
+PKG_VERSION="5e95bbf"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/addons/official/kodi-addons/screensaver.shadertoy/package.mk b/packages/addons/official/kodi-addons/screensaver.shadertoy/package.mk
@@ -49,6 +49,9 @@ pre_configure_target() {
                       -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
     export CFLAGS="$CFLAGS $BCM2835_INCLUDES"
     export CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES"
+  elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then
+    export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB"
+    export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB"
   fi
 
   cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \

diff --git a/packages/addons/official/kodi-addons/visualization.shadertoy/package.mk b/packages/addons/official/kodi-addons/visualization.shadertoy/package.mk
@@ -48,6 +48,9 @@ configure_target() {
                       -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux"
     export CFLAGS="$CFLAGS $BCM2835_INCLUDES"
     export CXXFLAGS="$CXXFLAGS $BCM2835_INCLUDES"
+  elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then
+    export CFLAGS="$CFLAGS -DLINUX -DEGL_API_FB"
+    export CXXFLAGS="$CXXFLAGS -DLINUX -DEGL_API_FB"
   fi
 
   cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \

diff --git a/packages/audio/libsndfile/package.mk b/packages/audio/libsndfile/package.mk
@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="libsndfile"
-PKG_VERSION="1.0.25"
+PKG_VERSION="1.0.26"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mega-nerd.com/libsndfile/"
 PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
+PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
@@ -37,7 +37,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \
                            --disable-silent-rules \
                            --disable-sqlite \
                            --enable-alsa \
-                           --enable-external-libs \
+                           --disable-external-libs \
                            --disable-experimental \
                            --disable-test-coverage \
                            --enable-largefile \

diff --git a/packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch b/packages/audio/libsndfile/patches/libsndfile-1.0.25-configure.patch
diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk
@@ -48,11 +48,18 @@ else
   PULSEAUDIO_AVAHI="--disable-avahi"
 fi
 
+if [ "$TARGET_FPU" = "neon" -o "$TARGET_FPU" = "neon-fp16" -o "$TARGET_FPU" = "neon-vfpv4" ]; then
+  PULSEAUDIO_NEON="--enable-neon-opt"
+else
+  PULSEAUDIO_NEON="--disable-neon-opt" 
+fi
+
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --disable-nls \
                            --enable-largefile \
                            --disable-rpath \
+                           $PULSEAUDIO_NEON \
                            --disable-x11 \
                            --disable-tests \
                            --disable-samplerate \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,3 +31,5 @@ PKG_LONGDESC="Libogg contains necessary functionality to create, decode, and wor

		PKG_IS_ADDON="no"
		PKG_AUTORECONF="yes"

		PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"