From 2feadbc3d1167ae29c3703d4069a460f03a23114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 10 Apr 2020 15:16:23 +0200 Subject: DilOS tdemultimedia: Refresh DilOS specific patches. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit dd61c60bf235c916d050340c5b5e440a9ad005fe) --- dilos/tdemultimedia/debian/patches/dilos.patch | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dilos/tdemultimedia/debian/patches/dilos.patch b/dilos/tdemultimedia/debian/patches/dilos.patch index ec4f0b163..db54ddbd9 100644 --- a/dilos/tdemultimedia/debian/patches/dilos.patch +++ b/dilos/tdemultimedia/debian/patches/dilos.patch @@ -11,19 +11,6 @@ Index: tdemultimedia/mpeglib/lib/util/audio/audioIO_SunOS.cpp /* declare these static to effectively isolate the audio device */ -Index: tdemultimedia/cmake/modules/TDEMacros.cmake -=================================================================== ---- tdemultimedia.orig/cmake/modules/TDEMacros.cmake -+++ tdemultimedia/cmake/modules/TDEMacros.cmake -@@ -833,7 +833,7 @@ macro( tde_add_library _arg_target ) - - # set embedded archives - if( _embed ) -- list( INSERT _link 0 -Wl,-whole-archive ${_embed} -Wl,-no-whole-archive ) -+ list( INSERT _link 0 -Wl,-zallextract ${_embed} -Wl,-zdefaultextract ) - endif( _embed ) - - # set link libraries Index: tdemultimedia/xine_artsplugin/tools/thumbnail/videoscaler.cpp =================================================================== --- tdemultimedia.orig/xine_artsplugin/tools/thumbnail/videoscaler.cpp @@ -213,7 +200,7 @@ Index: tdemultimedia/kscd/libwm/plat_sun.c +int codec_init( void ) { - register int i; + int i; @@ -873,9 +881,9 @@ codec_init( void ) foo.record.port = port; foo.record.balance = foo.play.balance = AUDIO_MID_BALANCE; -- cgit v1.2.1