From 7dc6a7c84caf6e889d52366806a1f6a97996c7ca Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 18:16:38 +0300
Subject: [PATCH 01/10] connman: update to connman-0515b22

---
 packages/network/connman/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index 9bdabcd53d..611bdbd906 100644
--- 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"

From 3f095fd3fb49c2f20db1a2b679f8b854b4cef16c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 19:11:05 +0300
Subject: [PATCH 02/10] libzip: build as static library

---
 packages/3rdparty/lib/libzip/build                     | 2 ++
 packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta | 2 +-
 packages/addons/service/multimedia/vdr-addon/addon     | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/3rdparty/lib/libzip/build b/packages/3rdparty/lib/libzip/build
index 486df11db2..eac71d1977 100755
--- 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
diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta
index 23dc31b34a..4d6b877e89 100644
--- 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 libxslt"
 PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index fb4f923ced..b6d817ee43 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -82,7 +82,6 @@ mkdir -p $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
 

From e6bd45efaceed3c283c15a3005f9567f7b82af0a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 19:12:00 +0300
Subject: [PATCH 03/10] libxslt: build as static library

---
 packages/3rdparty/lib/libxslt/build                    | 2 +-
 packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta | 2 +-
 packages/addons/service/multimedia/vdr-addon/addon     | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/3rdparty/lib/libxslt/build b/packages/3rdparty/lib/libxslt/build
index 8c2c9910e1..e4897f7f61 100755
--- 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 \
diff --git a/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta
index 4d6b877e89..426cd0893e 100644
--- 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 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"
diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index b6d817ee43..40bf1b4652 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -82,8 +82,6 @@ mkdir -p $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/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

From 5b1b1d81dadbf5028ec9e6a1b97c5f6fe1faac5d Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 19:22:05 +0300
Subject: [PATCH 04/10] cxxtools: build as static library

---
 packages/3rdparty/lib/cxxtools/build               | 8 ++++++--
 packages/addons/service/multimedia/vdr-addon/addon | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/3rdparty/lib/cxxtools/build b/packages/3rdparty/lib/cxxtools/build
index 7d5c3963c6..1a5ef25d23 100755
--- 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
 
diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index 40bf1b4652..b353f8e5e7 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -80,7 +80,6 @@ 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
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server

From 693aaeb2348be89cff10de2ffcf424109d5cac56 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 20:22:03 +0300
Subject: [PATCH 05/10] libevent: build as static library

---
 packages/addons/service/downloadmanager/transmission/addon | 3 ---
 packages/devel/libevent/build                              | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/addons/service/downloadmanager/transmission/addon b/packages/addons/service/downloadmanager/transmission/addon
index e63645d74e..8a1d44ff5a 100755
--- 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
diff --git a/packages/devel/libevent/build b/packages/devel/libevent/build
index dc69301208..277e5cd879 100755
--- 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

From 22cb99dbcabeb1521227490f38c9fa10ab9e825b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 22:37:57 +0300
Subject: [PATCH 06/10] ccid: update to ccid-1.4.10

---
 packages/3rdparty/lib/ccid/meta | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/3rdparty/lib/ccid/meta b/packages/3rdparty/lib/ccid/meta
index 2e90501c03..b574bbbb85 100644
--- 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"

From a0db08dbe68c90bd870eeeb7d55f3952b0e93a58 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 22:42:14 +0300
Subject: [PATCH 07/10] pcsc-lite: build as static library

---
 packages/3rdparty/system/pcsc-lite/build             |  4 ++--
 packages/addons/service/softcam/oscam/addon          |  4 ----
 .../softcam/oscam/patches/oscam-pcsc-pthread.patch   | 12 ++++++++++++
 packages/addons/service/system/pcscd-addon/addon     |  4 ----
 4 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch

diff --git a/packages/3rdparty/system/pcsc-lite/build b/packages/3rdparty/system/pcsc-lite/build
index 5bbf10611e..c67fb28d98 100755
--- 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
diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon
index ef0234a005..135872f2f0 100755
--- 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
diff --git a/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch b/packages/addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch
new file mode 100644
index 0000000000..4eeee55111
--- /dev/null
+++ 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)
diff --git a/packages/addons/service/system/pcscd-addon/addon b/packages/addons/service/system/pcscd-addon/addon
index 38fec379d4..4bee6bbaa6 100755
--- 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
 

From 0bd37096cb487c0713079473d600361a253f8f85 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 22:55:18 +0300
Subject: [PATCH 08/10] pcscd-addon: bump

---
 packages/addons/service/system/pcscd-addon/changelog.txt | 3 +++
 packages/addons/service/system/pcscd-addon/meta          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/system/pcscd-addon/changelog.txt b/packages/addons/service/system/pcscd-addon/changelog.txt
index 270c1c351b..03b4372bd1 100644
--- 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
diff --git a/packages/addons/service/system/pcscd-addon/meta b/packages/addons/service/system/pcscd-addon/meta
index 95bab6f169..9ff0d0bda7 100755
--- 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"

From b328b5db900893f1bedbe360f14ad81d8cf239d5 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 22:55:41 +0300
Subject: [PATCH 09/10] oscam: bump

---
 packages/addons/service/softcam/oscam/changelog.txt | 6 ++++++
 packages/addons/service/softcam/oscam/meta          | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt
index da62d4912b..bf831d8ce7 100644
--- 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
 
diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta
index 2928e9d4b0..546432afe1 100644
--- 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"

From beee159eaf5242ea8b7f3fa460ac5f1f2cc259e2 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 1 Jun 2013 22:56:15 +0300
Subject: [PATCH 10/10] transmission: bump

---
 .../addons/service/downloadmanager/transmission/changelog.txt   | 2 +-
 packages/addons/service/downloadmanager/transmission/meta       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt
index 1f02b02ec3..9442c47998 100644
--- 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
diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta
index f22bac6e70..bedb600908 100644
--- 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/"