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