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

2025-07-24 11:16:51 +00:00 · 2013-06-01 23:45:29 +02:00 · 2013-06-01 23:45:29 +02:00 · 820ec0ec52
commit 820ec0ec52
parent 2f38ab7bf0 beee159eaf
19 changed files with 43 additions and 31 deletions
--- a/packages/3rdparty/lib/ccid/meta
+++ b/packages/3rdparty/lib/ccid/meta
@ -19,12 +19,12 @@
 ################################################################################

 PKG_NAME="ccid"
-PKG_VERSION="1.4.9"
+PKG_VERSION="1.4.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3866/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain pcsc-lite"
 PKG_PRIORITY="optional"
--- a/packages/3rdparty/lib/cxxtools/build
+++ b/packages/3rdparty/lib/cxxtools/build
@ -43,13 +43,17 @@ cd ..

 setup_toolchain target

+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 mkdir -p .build-target && cd .build-target
 ../configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
            --disable-demos \
            --disable-unittest

--- a/packages/3rdparty/lib/libxslt/build
+++ b/packages/3rdparty/lib/libxslt/build
@ -33,7 +33,7 @@ fi
             --prefix=/usr \
             --sysconfdir=/etc \
             --enable-static \
-             --enable-shared \
+             --disable-shared \
             $CONFIG_LIBXML \
             --disable-ipv6 \
             --without-python \
--- a/packages/3rdparty/lib/libzip/build
+++ b/packages/3rdparty/lib/libzip/build
@ -27,6 +27,8 @@ cd $PKG_BUILD
 ./configure \
       --host=$TARGET_NAME \
       --build=$HOST_NAME \
+       --enable-static \
+       --disable-shared \
       --prefix=/usr 

 $MAKEINSTALL
--- a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta
+++ b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta
@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
 PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="vdr curl libzip libxml2 libxslt"
+PKG_DEPENDS="vdr curl libxml2"
 PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
--- a/packages/3rdparty/system/pcsc-lite/build
+++ b/packages/3rdparty/system/pcsc-lite/build
@ -30,8 +30,8 @@ PCSCD_ADDON_DIR="/storage/.xbmc/addons/service.system.pcscd-addon"
            --build=$HOST_NAME \
            --prefix=/usr \
            --sysconfdir=/etc \
-            --enable-shared \
-            --disable-static \
+            --disable-shared \
+            --enable-static \
            --disable-libudev \
            --enable-libusb \
            --enable-usbdropdir=$PCSCD_ADDON_DIR/drivers
--- a/packages/addons/service/downloadmanager/transmission/addon
+++ b/packages/addons/service/downloadmanager/transmission/addon
@ -30,6 +30,3 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/web
  cp -R $PKG_BUILD/web/* $ADDON_BUILD/$PKG_ADDON_ID/web
  find $ADDON_BUILD/$PKG_ADDON_ID/web -name "Makefile*" -exec rm -rf {} ";"
  rm -rf $ADDON_BUILD/$PKG_ADDON_ID/web/LICENSE
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp $BUILD/libevent-[0-9]*/.libs/libevent*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
--- a/packages/addons/service/downloadmanager/transmission/changelog.txt
+++ b/packages/addons/service/downloadmanager/transmission/changelog.txt
@ -1,4 +1,4 @@
-3.0.5 (in progress
+3.0.5
 - config cleanup (peer limits)

 3.0.4
--- a/packages/addons/service/downloadmanager/transmission/meta
+++ b/packages/addons/service/downloadmanager/transmission/meta
@ -20,7 +20,7 @@

 PKG_NAME="transmission"
 PKG_VERSION="2.77"
-PKG_REV="4"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.transmissionbt.com/"
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@ -80,11 +80,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin

 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
  cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/libzip-[0-9]*/lib/.libs/libzip*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/libxslt-[0-9]*/libxslt/.libs/libxslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/libxslt-[0-9]*/libexslt/.libs/libexslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib

 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
  cp -PR $BUILD/vdr-plugin-streamdev-*/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server
--- a/packages/addons/service/softcam/oscam/addon
+++ b/packages/addons/service/softcam/oscam/addon
@ -30,7 +30,3 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp -P $PKG_BUILD/build/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin
  cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -aP $BUILD/pcsc-lite-*/src/.libs/libpcsclite.so $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -aP $BUILD/pcsc-lite-*/src/.libs/libpcsclite.so.* $ADDON_BUILD/$PKG_ADDON_ID/lib
--- a/packages/addons/service/softcam/oscam/changelog.txt
+++ b/packages/addons/service/softcam/oscam/changelog.txt
@ -1,3 +1,9 @@
+3.0.11
+- update to oscam-8678
+
+3.0.10
+- update to oscam-8636
+
 3.0.9
 - update to oscam-8568

--- a/packages/addons/service/softcam/oscam/meta
+++ b/packages/addons/service/softcam/oscam/meta
@ -20,8 +20,8 @@
 ################################################################################

 PKG_NAME="oscam"
-PKG_VERSION="8636"
-PKG_REV="10"
+PKG_VERSION="8678"
+PKG_REV="11"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"
--- a/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch
+++ b/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch
@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd52430..b01b9fc 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -530,6 +530,7 @@ if (HAVE_PCSC)
+ if (NOT OSCamOperatingSystem MATCHES "Mac OS X")
+ if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin")
+     target_link_libraries (${exe_name} pcsclite)
+    target_link_libraries (${exe_name} pthread)
+ endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin")
+ endif (NOT OSCamOperatingSystem MATCHES "Mac OS X")
+ endif (HAVE_PCSC)
--- a/packages/addons/service/system/pcscd-addon/addon
+++ b/packages/addons/service/system/pcscd-addon/addon
@ -27,10 +27,6 @@

  cp -Pa $BUILD/pcsc-lite-*/src/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin

-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -Pa $BUILD/pcsc-lite-*/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -Pa $BUILD/pcsc-lite-*/src/spy/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-
  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial
  cp -Pa $BUILD/ccid-*/src/.libs/libccidtwin.so $ADDON_BUILD/$PKG_ADDON_ID/drivers/serial

--- a/packages/addons/service/system/pcscd-addon/changelog.txt
+++ b/packages/addons/service/system/pcscd-addon/changelog.txt
@ -1,3 +1,6 @@
+3.0.5
+- update to libccid-1.4.10
+
 3.0.4
 - update to pcsc-lite-1.8.8
 - update to libccid-1.4.9
--- a/packages/addons/service/system/pcscd-addon/meta
+++ b/packages/addons/service/system/pcscd-addon/meta
@ -21,7 +21,7 @@

 PKG_NAME="pcscd-addon"
 PKG_VERSION="3.0"
-PKG_REV="4"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
--- a/packages/devel/libevent/build
+++ b/packages/devel/libevent/build
@ -29,8 +29,8 @@ cd $PKG_BUILD
            --exec-prefix=/usr \
            --sysconfdir=/etc \
            --datadir=/usr/share \
-            --enable-shared \
-            --disable-static \
+            --disable-shared \
+            --enable-static \
            --enable-openssl

 make
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="connman"
-PKG_VERSION="76c47b9"
+PKG_VERSION="0515b22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"