summaryrefslogtreecommitdiffstats
path: root/dilos
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-04-10 15:16:23 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-04-10 15:16:41 +0200
commit2feadbc3d1167ae29c3703d4069a460f03a23114 (patch)
tree62c3e11c4e4791b52b8a8be843e6dec2b9e1d97f /dilos
parentd08e6b299887f8d1a1010c2e9cd1b88b1bb8db64 (diff)
downloadtde-packaging-2feadbc3d1167ae29c3703d4069a460f03a23114.tar.gz
tde-packaging-2feadbc3d1167ae29c3703d4069a460f03a23114.zip
DilOS tdemultimedia: Refresh DilOS specific patches.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit dd61c60bf235c916d050340c5b5e440a9ad005fe)
Diffstat (limited to 'dilos')
-rw-r--r--dilos/tdemultimedia/debian/patches/dilos.patch15
1 files changed, 1 insertions, 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;