diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch new file mode 100644 index 0000000000..0f6f059b45 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index d41acd1..58faab1 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,9 +5,6 @@ + # Debugging on/off + #IPTV_DEBUG = 1 + +-# Strip debug symbols? Set eg. to /bin/true if not +-STRIP = strip +- + # The official name of this plugin. + # This name will be used in the '-P...' option of VDR to load the plugin. + # By default the main source file also carries this name. diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index d29f6b09f7..b775399ed0 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -33,10 +33,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config cp $BUILD/vdr-[0-9]*/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config cp $BUILD/vdr-[0-9]*/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live - cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins @@ -56,10 +53,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-sc-*/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-streamdev-*/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-streamdev-*/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-live-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin # ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2" @@ -80,8 +75,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/libcap-[0-9]*/libcap/*.so* $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 diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index f88770f309..50589e6c67 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -10,12 +10,8 @@ - - - - diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 368c9637ce..2087e40340 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr" +PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev rotorng vdr-control vdr-plugin-xmltv2vdr" PKG_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index 13ab9acfb2..6fafe85089 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -68,18 +68,12 @@ fi if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol" fi -if [ "$ENABLE_LIVE" == "true" ] ; then - VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'" -fi if [ "$ENABLE_ROTORNG" == "true" ] ; then VDR_ARG="$VDR_ARG -P rotorng" fi if [ "$ENABLE_CONTROL" == "true" ] ; then VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'" fi -if [ "$ENABLE_EPGSEARCH" == "true" ] ; then - VDR_ARG="$VDR_ARG -P epgsearch" -fi if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then VDR_ARG="$VDR_ARG -P xmltv2vdr" fi @@ -101,15 +95,6 @@ fi cp $config $ADDON_CONFIG_DIR/$config fi done - - if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then - sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf - fi - cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA -epgsearch.SVDRPPort = 2004 -MYDATA - ) if [ ! "$(pidof vdr.bin)" ];then 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 index afbdee613c..87fa87b5d5 100644 --- 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 @@ -15,13 +15,9 @@ Enable plugin: dynamite Enable softcam softcam plugin - Enable plugin: live - live: listen on ip - live: listen on port Enable plugin: rotorng Enable plugin: control control: listen on port - Enable plugin: epgsearch Enable plugin: xmltv2vdr Enable epgdata.com epgdata.com PIN diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index 1f82adda78..f470e56b63 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -20,13 +20,9 @@ - - - - diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.11-AE-make_sure_we_reopen_when_the_flag_is_set_or_we_run_into_trouble.patch b/packages/mediacenter/xbmc/patches/xbmc-990.11-AE-make_sure_we_reopen_when_the_flag_is_set_or_we_run_into_trouble.patch deleted file mode 100644 index cb55387336..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-990.11-AE-make_sure_we_reopen_when_the_flag_is_set_or_we_run_into_trouble.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 87cc3d07ec7eb27c065920f0741e649f72b86acd Mon Sep 17 00:00:00 2001 -From: fritsch -Date: Tue, 12 Feb 2013 22:29:27 +0100 -Subject: [PATCH] AE: make sure we reOpen when the flag is set or we run into - trouble - ---- - xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - -diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -index dc01abe..085ae30 100644 ---- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -@@ -1055,21 +1055,12 @@ void CSoftAE::Run() - { - bool restart = false; - -- /* Clean Up what the suspend guy might have forgotten */ -- // ProcessSuspending() cannot guarantee that we get our sink back softresumed -- // that is a big problem as another thread could start adding packets -- // this must be checked here, before writing anything on the sinks -- if(m_sinkIsSuspended && m_sink) -- { -- CLog::Log(LOGDEBUG, "CSoftAE::Run - Someone has forgotten to resume us (device resumed)"); -- m_reOpen = !m_sink->SoftResume() || m_reOpen; -- m_sinkIsSuspended = false; -- } -- if ((this->*m_outputStageFn)(hasAudio) > 0) -+ /* with the new non blocking implementation - we just reOpen here, when it tells reOpen */ -+ if (!m_reOpen && (this->*m_outputStageFn)(hasAudio) > 0) - hasAudio = false; /* taken some audio - reset our silence flag */ - - /* if we have enough room in the buffer */ -- if (m_buffer.Free() >= m_frameSize) -+ if (!m_reOpen && m_buffer.Free() >= m_frameSize) - { - /* take some data for our use from the buffer */ - uint8_t *out = (uint8_t*)m_buffer.Take(m_frameSize); --- -1.7.10 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.12-2058.patch b/packages/mediacenter/xbmc/patches/xbmc-990.12-PR2058.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/xbmc-990.12-2058.patch rename to packages/mediacenter/xbmc/patches/xbmc-990.12-PR2058.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch b/packages/mediacenter/xbmc/patches/xbmc-990.13-PR2218.patch similarity index 74% rename from packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch rename to packages/mediacenter/xbmc/patches/xbmc-990.13-PR2218.patch index a8a2a65953..60797bc436 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-990.07-PR2218.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-990.13-PR2218.patch @@ -1,7 +1,7 @@ -From 9abc7d0311a3adc6e83d289d54c3e2d0fffc0d28 Mon Sep 17 00:00:00 2001 +From 4ffe9d056514aee9728a707f15f8eb78b71fd202 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 10 Feb 2013 21:49:31 +0100 -Subject: [PATCH 1/3] AE: Linux AE - some fixes of yesterday merge (Enumerate +Subject: [PATCH 1/5] AE: Linux AE - some fixes of yesterday merge (Enumerate + Resume) --- @@ -38,10 +38,10 @@ index 96a9a72..20af5a1 100644 1.7.10 -From 3dfe32ce310b7543f58572f59c3c9223c38bae20 Mon Sep 17 00:00:00 2001 +From 934a29f37b97f7c7b43a9da7086765f1134428a4 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 11 Feb 2013 00:08:05 +0100 -Subject: [PATCH 2/3] AE: in doubt restore old suspend behaviour +Subject: [PATCH 2/5] AE: in doubt restore old suspend behaviour --- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 49 +++++++++++++++------- @@ -129,17 +129,17 @@ index 20af5a1..0f6c6ed 100644 1.7.10 -From 9dfebbdd375a2447f9f0d326a40696885e637520 Mon Sep 17 00:00:00 2001 +From cfa7d8d2ca9aa5641f5a6cb5169b2c19c0990992 Mon Sep 17 00:00:00 2001 From: fritsch Date: Mon, 11 Feb 2013 03:08:42 +0100 -Subject: [PATCH 3/3] AE: Choose indirection when possible. Care for lazy +Subject: [PATCH 3/5] AE: Choose indirection when possible. Care for lazy evaluation --- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 46 ++++++---------------- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h | 2 - - xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 7 ++-- - 3 files changed, 16 insertions(+), 39 deletions(-) + xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp | 11 +++--- + 3 files changed, 18 insertions(+), 41 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp index 0f6c6ed..dc01abe 100644 @@ -304,18 +304,21 @@ index 559e055..26d5e9c 100644 CCriticalSection m_runningLock; /* released when the thread exits */ diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -index b06d358..985c201 100644 +index b06d358..fe40d17 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp -@@ -1145,15 +1145,16 @@ bool CAESinkALSA::SoftSuspend() +@@ -1144,16 +1144,17 @@ bool CAESinkALSA::SoftSuspend() + } bool CAESinkALSA::SoftResume() { - // reinit all the clibber -+ bool ret = true; // all fine +- // reinit all the clibber ++ // reinit all the clibber ++ bool ret = true; // all fine if(!m_pcm) { if (!snd_config) - snd_config_update(); +- snd_config_update(); ++ snd_config_update(); - Initialize(m_initFormat, m_initDevice); + ret = Initialize(m_initFormat, m_initDevice); @@ -330,3 +333,88 @@ index b06d358..985c201 100644 -- 1.7.10 + +From 87cc3d07ec7eb27c065920f0741e649f72b86acd Mon Sep 17 00:00:00 2001 +From: fritsch +Date: Tue, 12 Feb 2013 22:29:27 +0100 +Subject: [PATCH 4/5] AE: make sure we reOpen when the flag is set or we run + into trouble + +--- + xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp +index dc01abe..085ae30 100644 +--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp +@@ -1055,21 +1055,12 @@ void CSoftAE::Run() + { + bool restart = false; + +- /* Clean Up what the suspend guy might have forgotten */ +- // ProcessSuspending() cannot guarantee that we get our sink back softresumed +- // that is a big problem as another thread could start adding packets +- // this must be checked here, before writing anything on the sinks +- if(m_sinkIsSuspended && m_sink) +- { +- CLog::Log(LOGDEBUG, "CSoftAE::Run - Someone has forgotten to resume us (device resumed)"); +- m_reOpen = !m_sink->SoftResume() || m_reOpen; +- m_sinkIsSuspended = false; +- } +- if ((this->*m_outputStageFn)(hasAudio) > 0) ++ /* with the new non blocking implementation - we just reOpen here, when it tells reOpen */ ++ if (!m_reOpen && (this->*m_outputStageFn)(hasAudio) > 0) + hasAudio = false; /* taken some audio - reset our silence flag */ + + /* if we have enough room in the buffer */ +- if (m_buffer.Free() >= m_frameSize) ++ if (!m_reOpen && m_buffer.Free() >= m_frameSize) + { + /* take some data for our use from the buffer */ + uint8_t *out = (uint8_t*)m_buffer.Take(m_frameSize); +-- +1.7.10 + + +From d6b5df01dee73bf3a6bf4c88c9aeb242396a7b69 Mon Sep 17 00:00:00 2001 +From: fritsch +Date: Wed, 13 Feb 2013 08:34:09 +0100 +Subject: [PATCH 5/5] AE: hold streamlock longer in FreeStream until the data + is gone (could still be used in Output Stage) + +--- + xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp +index 085ae30..3dcdcd7 100644 +--- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp ++++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp +@@ -730,6 +730,7 @@ void CSoftAE::PauseStream(CSoftAEStream *stream) + streamLock.Leave(); + + m_reOpen = true; ++ m_wake.Set(); + } + + void CSoftAE::ResumeStream(CSoftAEStream *stream) +@@ -741,6 +742,7 @@ void CSoftAE::ResumeStream(CSoftAEStream *stream) + + m_streamsPlaying = true; + m_reOpen = true; ++ m_wake.Set(); + } + + void CSoftAE::Stop() +@@ -869,7 +871,6 @@ IAEStream *CSoftAE::FreeStream(IAEStream *stream) + CSingleLock lock(m_streamLock); + RemoveStream(m_playingStreams, (CSoftAEStream*)stream); + RemoveStream(m_streams , (CSoftAEStream*)stream); +- lock.Leave(); + // Reopen is old behaviour. Not opening when masterstream stops means clipping on S/PDIF. + if(!m_isSuspended && (m_masterStream == stream)) + m_reOpen = true; +-- +1.7.10 +