Add new revision with patch to fix strict-aliasing breakage.

(Portage version: 2.1.1_pre1)

2 files changed, 330 insertions, 0 deletions

diff --git a/media-tv/xdtv/files/digest-xdtv-2.3.2-r1 b/media-tv/xdtv/files/digest-xdtv-2.3.2-r1
new file mode 100644
index 000000000000..06d86e9e0612
--- /dev/null
+++ b/media-tv/xdtv/files/digest-xdtv-2.3.2-r1
@@ -0,0 +1,93 @@
+MD5 b73d038ed88a457103c8774c64d5f620 libxdtv-i18n-ca-1.3.0.tar.gz 638256
+RMD160 e9e0de1a1c37bee4b7cf001fc42976599df1527e libxdtv-i18n-ca-1.3.0.tar.gz 638256
+SHA256 6dc2cc65128e9e5d11a536f0b86a57cd193fbc12cbf2817a28e53a2049ed198a libxdtv-i18n-ca-1.3.0.tar.gz 638256
+MD5 054af1345b2a731f2f28f43b4b9218fd libxdtv-i18n-de-1.3.0.tar.gz 633884
+RMD160 5b6d094253bb57fa8c8eb6f677169d74d6af8bcd libxdtv-i18n-de-1.3.0.tar.gz 633884
+SHA256 b6abeef649d3b48a40b43d492155ff1e6cbfbb494574b612a834bf14203a05d4 libxdtv-i18n-de-1.3.0.tar.gz 633884
+MD5 154cc99aa8ce26fc98db85a852ef5e51 libxdtv-i18n-en-1.3.0.tar.gz 583704
+RMD160 3ecc63677a9019a0eb7b5ad08829b4f217cbd863 libxdtv-i18n-en-1.3.0.tar.gz 583704
+SHA256 271243cd258778aa44affbcfc6c9bde71d16d8c68288ffa47ce476752c14e1a3 libxdtv-i18n-en-1.3.0.tar.gz 583704
+MD5 870ca47b1ba50c69a0948f574c6866aa libxdtv-i18n-es-1.3.0.tar.gz 636460
+RMD160 6244a3f21a54de3abb2b5de4a28087c6c696ae32 libxdtv-i18n-es-1.3.0.tar.gz 636460
+SHA256 582b2599f1abeae6285545355c032d86e2d2ea57c2dd49b7f52662655f5f8a68 libxdtv-i18n-es-1.3.0.tar.gz 636460
+MD5 74651cf544e88b7167c6c88550693f54 libxdtv-i18n-fr-1.3.0.tar.gz 642408
+RMD160 0ae0e3c4e2395f02af49eb5b97b20f7d643b50a4 libxdtv-i18n-fr-1.3.0.tar.gz 642408
+SHA256 dc41cebb81e8a42b9fec11b9943eb25c843885d6fd39b94660f1d530d3ac86a8 libxdtv-i18n-fr-1.3.0.tar.gz 642408
+MD5 d797af076746e0687b4ee6f531c0ffef libxdtv-i18n-gl-1.3.0.tar.gz 641434
+RMD160 dfe5902c953376087642a6c22c713e916da0cb81 libxdtv-i18n-gl-1.3.0.tar.gz 641434
+SHA256 975fbe7f4ea9185b63f113662befaee720636463d7a0aa07493f84586dd83966 libxdtv-i18n-gl-1.3.0.tar.gz 641434
+MD5 5d36abb0ae4fcb51930cb9252405988d libxdtv-i18n-it-1.3.0.tar.gz 638380
+RMD160 675207aeac91080b4030fa028d8d56d40ad87292 libxdtv-i18n-it-1.3.0.tar.gz 638380
+SHA256 e640ef4bcdfffc55ce7442d120a8bb03bb6b719677cb8ec8c081cff9e7f6d1a3 libxdtv-i18n-it-1.3.0.tar.gz 638380
+MD5 6932f58dceb968933a8439db3d1c0f47 libxdtv-i18n-ja-1.3.0.tar.gz 621190
+RMD160 d2b24f5799ba4fcc5568d679b267c87b19a57e0d libxdtv-i18n-ja-1.3.0.tar.gz 621190
+SHA256 9b54882b0548de6f668256b5a1d8bbc19dcc5dced978c5f713a0f451ac5f71cd libxdtv-i18n-ja-1.3.0.tar.gz 621190
+MD5 194ce099fd708573a4cfb94d257c90a2 libxdtv-i18n-pl-1.3.0.tar.gz 643831
+RMD160 1cd6c507d4d50ac38d435f98b7a5beb88f1dfa17 libxdtv-i18n-pl-1.3.0.tar.gz 643831
+SHA256 d2f8b26e3c15a964da1715bad060c02f49045f864b554ccc41d08e3218f25000 libxdtv-i18n-pl-1.3.0.tar.gz 643831
+MD5 b879caaf4df7f04391fb3f96b0434456 libxdtv-i18n-ru-1.3.0.tar.gz 639287
+RMD160 ca1d95c2357e7682c403ad266384ef8d04316ec6 libxdtv-i18n-ru-1.3.0.tar.gz 639287
+SHA256 8cd53aa6ac18948223d6cbcfcd5d687cd644243678b58f4f36e62720cf04b340 libxdtv-i18n-ru-1.3.0.tar.gz 639287
+MD5 097ed70dbf0ffa81ab86310bdcb890d0 libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
+RMD160 ccded0eb1d1986dd54295126e43a022a84c498ab libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
+SHA256 248aede4da383f1dd9c09086f129e54bb49d3fbd3fd5fbb0c453e8fbe34e183b libxdtv-theme-aqua-ca-1.3.0.tar.gz 352441
+MD5 ddc42e332f4b97474da9d279f298e2c7 libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
+RMD160 fc3a997942ad3ef02c0365f52f1113b7b820d28b libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
+SHA256 ae61a878fad4271bc99740fca36eb2ff8fb2673cda4730be5eee3da57178b8b8 libxdtv-theme-aqua-de-1.3.0.tar.gz 351421
+MD5 889fa91845d86ddf247a7ef2412c7f03 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
+RMD160 bb351bdfdc9d5a5be42c10a7c7b3a48d89e22dc5 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
+SHA256 b8098b67d5a76933607540920f1cb1c0f92a2ab97c6eaa0cb29c5767d3e775d4 libxdtv-theme-aqua-en-1.3.0.tar.gz 353233
+MD5 46fd9ce9f9012b811ef6d0ff7d96d593 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
+RMD160 222915463e1a1408d2b9abe81617c14c4b34bea7 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
+SHA256 a2e26c47ce562976e3ec285d704604c0d385bb2c3a2d4f90f1020f7b662567b6 libxdtv-theme-aqua-es-1.3.0.tar.gz 353137
+MD5 8da90502892363ecd3cb0338a9186d06 libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
+RMD160 a98e7b84e8b18f12cd3973449d6b6d43d88ec1cc libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
+SHA256 925a82f5dced5b881b240802d1d3e07c0bad40b8f5999aa1a7bdaf2bce0a8876 libxdtv-theme-aqua-fr-1.3.0.tar.gz 354819
+MD5 75567ab74db5cf093c5dbd562227448b libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
+RMD160 bef7f53f910e3c35547262c533c781ec66008791 libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
+SHA256 3bc3b1991330f2cebc8cf02c852acf3611ba3cb0015a812aa52c75b82fd5de68 libxdtv-theme-aqua-gl-1.3.0.tar.gz 360310
+MD5 f1c233c43e735e182e668268b2cebe4f libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
+RMD160 0497616e00b7a43916045af44fb9aab76f42aa4c libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
+SHA256 f94157eb84a01325d5e42c29553d64bb8c9a95c223d4e1f350dfe9948d8d3ca0 libxdtv-theme-aqua-it-1.3.0.tar.gz 352958
+MD5 449464fa7138b2fb3098cbe660009e12 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
+RMD160 72a2958d12348182e11672bb7801c8e76c5329a9 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
+SHA256 92f7aaef28554a0f0c15f68e89c3a7d3c673cd0361b2bcfd36911b2e320a9af0 libxdtv-theme-aqua-ja-1.3.0.tar.gz 332709
+MD5 317e89112f3b6630f100bd2e70a4a67e libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
+RMD160 ac0664da9cdefdd5af70583eb2223c5668611f4f libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
+SHA256 3b1fdba8e0abc3b695f23f74825c829db55f7843ac1cfc7d2c15ecc52b7af6de libxdtv-theme-aqua-pl-1.3.0.tar.gz 359057
+MD5 f883b6ea0ee3bf7158b80f4c7ede3098 libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
+RMD160 e0a1455a56bac3fe940e9a1e39301002a7b1d49b libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
+SHA256 ebac73c26e3bd4bcb1b399c13145e401367f3fe4e2283cf9c736ee33e368b40f libxdtv-theme-aqua-ru-1.3.0.tar.gz 353110
+MD5 31e7645f1594777870db1247cee304dd libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
+RMD160 a7502f6b82924e4d4c5fcc892920fe902cda68e5 libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
+SHA256 4d857a1f37deb92b4c11a1fde1796413dc195c9520565712fe738552599d7718 libxdtv-theme-carbone-ca-1.3.0.tar.gz 394819
+MD5 c3ef10cfda3f3dac61d0f131dbfa4deb libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
+RMD160 9d3e44cf07c8bc3c43dcb3251d8b9f1f2721c27f libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
+SHA256 013fb39e0e1ffc04ac6dd90df0e093ff4f7fe98b28ed4bbf1a25cedd57504f4f libxdtv-theme-carbone-de-1.3.0.tar.gz 397029
+MD5 40ba15788c76d4165538cc78fbf1881d libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
+RMD160 668d897bd93445c2b08179d814a5f40cd5f410c7 libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
+SHA256 64df9e88fe751db0d5ddb5e97389bc1d982d39766e97758b67470dd5d3b54fc5 libxdtv-theme-carbone-en-1.3.0.tar.gz 393569
+MD5 0c130a2a6ded0387985e43e172523842 libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
+RMD160 07c56713733013afd2a30f2deb8dfd582c387b47 libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
+SHA256 17d27aaee357aeed29386f34cb47cad505ef61270f4c69d5133903072bbcf9fb libxdtv-theme-carbone-es-1.3.0.tar.gz 397231
+MD5 072b5577ef71460dab527722583ef334 libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
+RMD160 a126e4b66ec16426aff0b1b3a47df5d0397b438f libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
+SHA256 f6068987364594ab5a368208130e42f26e0f10f42d7e7cdbd5f47be2906feffd libxdtv-theme-carbone-fr-1.3.0.tar.gz 397603
+MD5 b50960e7bccdaba28e0e5653039a476e libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
+RMD160 00d60ff24c3dfcefcc9450c24a5eb41f9c2dd3a7 libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
+SHA256 c24ee64d5808d96e9fa17d0742cd02999086313c51e3ac6e55cc19bed1f3000f libxdtv-theme-carbone-gl-1.3.0.tar.gz 403660
+MD5 dd23097104b095d2db047ab9ddc77c96 libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
+RMD160 0b6bed802998f26b5d09ece798c32edcf0ed174a libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
+SHA256 89cb2f8f1ab29799d6dd8a556af26db882d8aa25ee6548059aedd0cd80716f56 libxdtv-theme-carbone-it-1.3.0.tar.gz 399396
+MD5 5346d714ffe442462b65acc2f738280e libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
+RMD160 1596eaaad3db174974e99780deb32071edfc6af2 libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
+SHA256 de2246f9653438ccb5ebef85edf97fb179cb1f0b211a969722b0145307149499 libxdtv-theme-carbone-ja-1.3.0.tar.gz 373453
+MD5 e56ec2f89767940326e2d82fc32c969f libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
+RMD160 3821660aebd489abf2830fff35ac0c8ec3aa3f52 libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
+SHA256 d9737a45242b384e557ea56713b14d00c722c23d04aafe68ac9c863494efff9b libxdtv-theme-carbone-pl-1.3.0.tar.gz 396722
+MD5 89aaf20a63b63e5d81c3998c8a0e2f15 libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
+RMD160 f9de71a685296cf00339d9193b382597f4e449bd libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
+SHA256 6481b50f0a3ea862c152e8000cb281cfb0269331a6d5a2a0fee89e75e0e5282e libxdtv-theme-carbone-ru-1.3.0.tar.gz 394769
+MD5 3e4b2b518b6ab209e5ebc82a6c413d2a xdtv-2.3.2.tar.gz 2775914
+RMD160 cac6da447bce28599bc8b806525f6c1a7a7e8ddd xdtv-2.3.2.tar.gz 2775914
+SHA256 b36e9a1ce9aaf7e499f1d93ae22e384bf83fbb05c28fcd73da290945142468c1 xdtv-2.3.2.tar.gz 2775914
diff --git a/media-tv/xdtv/files/xdtv-2.3.2-strict-aliasing.patch b/media-tv/xdtv/files/xdtv-2.3.2-strict-aliasing.patch
new file mode 100644
index 000000000000..8baa0830ff46
--- /dev/null
+++ b/media-tv/xdtv/files/xdtv-2.3.2-strict-aliasing.patch
@@ -0,0 +1,237 @@
+Index: xdtv-2.3.2-sa/alevt/Makefile.am
+===================================================================
+--- xdtv-2.3.2-sa.orig/alevt/Makefile.am
++++ xdtv-2.3.2-sa/alevt/Makefile.am
+@@ -1,5 +1,6 @@
+ noinst_LIBRARIES = libalevt.a
+ 
++libalevt_a_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+ libalevt_a_SOURCES = \
+ alevt_main.c \
+ cache.c \
+Index: xdtv-2.3.2-sa/libavcodec/libpostproc/Makefile
+===================================================================
+--- xdtv-2.3.2-sa.orig/libavcodec/libpostproc/Makefile
++++ xdtv-2.3.2-sa/libavcodec/libpostproc/Makefile
+@@ -10,7 +10,7 @@ PPLIB = $(LIBPREF)postproc$(LIBSUF)
+ 
+ PPOBJS=postprocess.o
+ 
+-CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. -I$(SRC_PATH)/libavcodec $(EXTRA_INC)
++CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. -I$(SRC_PATH)/libavcodec $(EXTRA_INC) -fno-strict-aliasing
+ 
+ %.o: %.c
+ 	$(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
+Index: xdtv-2.3.2-sa/libavcodec/Makefile
+===================================================================
+--- xdtv-2.3.2-sa.orig/libavcodec/Makefile
++++ xdtv-2.3.2-sa/libavcodec/Makefile
+@@ -10,7 +10,7 @@ include ../config.mak
+ VPATH=$(SRC_PATH)/libavcodec
+ 
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
++CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS) -fno-strict-aliasing
+ 
+ OBJS= bitstream.o utils.o mem.o allcodecs.o \
+       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
+Index: xdtv-2.3.2-sa/libavformat/Makefile
+===================================================================
+--- xdtv-2.3.2-sa.orig/libavformat/Makefile
++++ xdtv-2.3.2-sa/libavformat/Makefile
+@@ -9,7 +9,7 @@ include ../config.mak
+ 
+ VPATH=$(SRC_PATH)/libavformat
+ 
+-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fno-strict-aliasing
+ 
+ OBJS= utils.o cutils.o os_support.o allformats.o
+ PPOBJS=
+Index: xdtv-2.3.2-sa/libavutil/Makefile
+===================================================================
+--- xdtv-2.3.2-sa.orig/libavutil/Makefile
++++ xdtv-2.3.2-sa/libavutil/Makefile
+@@ -9,7 +9,7 @@ include ../config.mak
+ VPATH=$(SRC_PATH)/libavutil
+ 
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fno-strict-aliasing
+ 
+ OBJS= mathematics.o \
+       integer.o \
+Index: xdtv-2.3.2-sa/src/audio-alsa.c
+===================================================================
+--- xdtv-2.3.2-sa.orig/src/audio-alsa.c
++++ xdtv-2.3.2-sa/src/audio-alsa.c
+@@ -49,7 +49,7 @@ static int alsa_check(void) {
+ }
+ 
+ static int alsa_configure(snd_pcm_t *handle,unsigned int *rate,
+-			  int fmtsample, int nchannels, unsigned int nfrags, int fragsize) {
++			  int fmtsample, int nchannels, unsigned int nfrags, snd_pcm_uframes_t fragsize) {
+   snd_pcm_hw_params_t *hw_params = NULL;
+   int err;
+   err = snd_pcm_nonblock(handle, 0);
+@@ -72,7 +72,7 @@ static int alsa_configure(snd_pcm_t *han
+   err = snd_pcm_hw_params_set_access(handle, hw_params,SND_PCM_ACCESS_RW_INTERLEAVED);
+   CHECKALSA(err,"snd_pcm_hw_params_set_access");
+ #ifdef ALSA_NEW_PARAMS
+-  err = snd_pcm_hw_params_set_period_size_near(handle, hw_params,(snd_pcm_uframes_t*)&fragsize, 0);
++  err = snd_pcm_hw_params_set_period_size_near(handle, hw_params, &fragsize, 0);
+ #else
+   err = snd_pcm_hw_params_set_period_size_near(handle, hw_params, fragsize, 0);
+ #endif
+@@ -93,7 +93,7 @@ static int alsa_configure(snd_pcm_t *han
+ }
+ 
+ static int alsa_open(int mode, int fmtsample, int nchannels, int freq,
+-		     int nfrags, int fragsize) {
++		     int nfrags, snd_pcm_uframes_t fragsize) {
+   int err;
+   unsigned int rate_in = freq, rate_out = freq;
+   if(audio_dev) card=audio_dev;
+Index: xdtv-2.3.2-sa/src/main.c
+===================================================================
+--- xdtv-2.3.2-sa.orig/src/main.c
++++ xdtv-2.3.2-sa/src/main.c
+@@ -1452,8 +1452,12 @@ set_float (Widget widget, char *name, fl
+        * Convince C not to perform an automatic conversion, which
+        * would truncate 0.5 to 0.
+        */
+-      XtArgVal *l_top = (XtArgVal *) & value;
+-      XtSetArg (args[0], name, *l_top);
++      union {
++      	float val;
++	XtArgVal arg;
++      } u;
++      u.val = value;
++      XtSetArg (args[0], name, u.arg);
+     }
+   XtSetValues (widget, args, 1);
+ }
+Index: xdtv-2.3.2-sa/src/pixmaps_loader.c
+===================================================================
+--- xdtv-2.3.2-sa.orig/src/pixmaps_loader.c
++++ xdtv-2.3.2-sa/src/pixmaps_loader.c
+@@ -116,25 +116,25 @@ load_lib(char* name, int exit_on_error)
+       if(exit_on_error) exit(1);
+   }  else {
+ 	  
+-    *(void **) (&create_main_pix)   = dlsym(handle, "create_main_action_pixmap");
+-    *(void **) (&create_editor_pix) = dlsym(handle, "create_editor_pixmap");
+-    *(void **) (&create_divx_pix) = dlsym(handle, "create_divx_pixmap");
+-    *(void **) (&create_divxaudio_pix) = dlsym(handle, "create_divxaudio_pixmap");
+-    *(void **) (&create_divxstream_common_pix) = dlsym(handle, "create_divxstream_common_pixmap");
+-    *(void **) (&create_divxstream_on_pix) = dlsym(handle, "create_divxstream_on_pixmap");
+-    *(void **) (&create_divxstream_off_pix) = dlsym(handle, "create_divxstream_off_pixmap");
+-    *(void **) (&create_fileselector_pix) = dlsym(handle, "create_fileselector_pixmap");
+-    *(void **) (&create_fileselector_menu_pix) = dlsym(handle, "create_fileselector_menu_pixmap");
+-    *(void **) (&create_alevt_pix) = dlsym(handle, "create_alevt_pixmap");
+-    *(void **) (&create_grab_pix) = dlsym(handle, "create_grab_pixmap");
+-    *(void **) (&create_xosd_pix) = dlsym(handle, "create_xosd_pixmap");
+-    *(void **) (&create_plugin_pix) = dlsym(handle, "create_plugin_pixmap");
+-    *(void **) (&create_x11_pix) = dlsym(handle, "create_x11_pixmap");
+-    *(void **) (&create_popup_pix) = dlsym(handle, "create_popup_pixmap");
+-    *(void **) (&create_help_pix) = dlsym(handle, "create_help_pixmap");
+-    *(void **) (&create_subtitle_pix) = dlsym(handle, "create_subtitle_pixmap");
+-    *(void **) (&create_ffmpeg_pix) = dlsym(handle, "create_ffmpeg_pixmap");
+-    *(void **) (&create_xvid_pix) = dlsym(handle, "create_xvid_pixmap");
++    create_main_pix  = dlsym(handle, "create_main_action_pixmap");
++    create_editor_pix = dlsym(handle, "create_editor_pixmap");
++    create_divx_pix = dlsym(handle, "create_divx_pixmap");
++    create_divxaudio_pix = dlsym(handle, "create_divxaudio_pixmap");
++    create_divxstream_common_pix = dlsym(handle, "create_divxstream_common_pixmap");
++    create_divxstream_on_pix = dlsym(handle, "create_divxstream_on_pixmap");
++    create_divxstream_off_pix = dlsym(handle, "create_divxstream_off_pixmap");
++    create_fileselector_pix = dlsym(handle, "create_fileselector_pixmap");
++    create_fileselector_menu_pix = dlsym(handle, "create_fileselector_menu_pixmap");
++    create_alevt_pix = dlsym(handle, "create_alevt_pixmap");
++    create_grab_pix = dlsym(handle, "create_grab_pixmap");
++    create_xosd_pix = dlsym(handle, "create_xosd_pixmap");
++    create_plugin_pix = dlsym(handle, "create_plugin_pixmap");
++    create_x11_pix = dlsym(handle, "create_x11_pixmap");
++    create_popup_pix = dlsym(handle, "create_popup_pixmap");
++    create_help_pix = dlsym(handle, "create_help_pixmap");
++    create_subtitle_pix = dlsym(handle, "create_subtitle_pixmap");
++    create_ffmpeg_pix = dlsym(handle, "create_ffmpeg_pixmap");
++    create_xvid_pix = dlsym(handle, "create_xvid_pixmap");
+ 
+     if ((error = dlerror()) != NULL){
+       if (debug||1)
+Index: xdtv-2.3.2-sa/src/stringuty.c
+===================================================================
+--- xdtv-2.3.2-sa.orig/src/stringuty.c
++++ xdtv-2.3.2-sa/src/stringuty.c
+@@ -411,7 +411,7 @@ int VaGetPointorsLink(const PointorsLink
+ 	va_start(argument, linkBuffer);
+ 
+ 	argc = 0;
+-	argv_ptr = (void**)&argv_ptr;
++	argv_ptr = &argv_ptr;
+ 
+ 	while(linkBuffer != NULL && argv_ptr != NULL) {
+ 
+Index: xdtv-2.3.2-sa/src/xdtv_v4l-conf.c
+===================================================================
+--- xdtv-2.3.2-sa.orig/src/xdtv_v4l-conf.c
++++ xdtv-2.3.2-sa/src/xdtv_v4l-conf.c
+@@ -237,7 +237,7 @@ displayinfo_dga(Display *dpy, struct DIS
+ 	fprintf(stderr,"WARNING: No DGA support available for this display.\n");
+ 	return;
+     }
+-    XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(int*)&base,&width,&foo,&bar);
++    XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),&base,&width,&foo,&bar);
+     d->bpl  = width * d->bpp/8;
+     d->base = base;
+ #else
+Index: xdtv-2.3.2-sa/src/xscreensaver.c
+===================================================================
+--- xdtv-2.3.2-sa.orig/src/xscreensaver.c
++++ xdtv-2.3.2-sa/src/xscreensaver.c
+@@ -124,7 +124,7 @@ find_screensaver_window (Display *dpy, c
+                                    XA_SCREENSAVER_VERSION,
+                                    0, 200, False, XA_STRING,
+                                    &type, &format, &nitems, &bytesafter,
+-                                   (unsigned char **) &v);
++                                   &v);
+       XSync (dpy, False);
+       XSetErrorHandler (old_handler);
+       old_handler = 0;
+@@ -227,7 +227,7 @@ send_xscreensaver_command (Display *dpy,
+ 				  XA_SCREENSAVER_STATUS,
+ 				  0, 999, False, XA_INTEGER,
+ 				  &type, &format, &nitems, &bytesafter,
+-				  (unsigned char **) &data)
++				  &data)
+ 	      == Success
+ 	      && type
+ 	      && data)
+@@ -419,7 +419,7 @@ xscreensaver_command_response (Display *
+ 					0, 1024, True,
+ 					AnyPropertyType,
+ 					&type, &format, &nitems, &bytesafter,
+-					(unsigned char **) &msg);
++					&msg);
+ 	      XSync (dpy, False);
+               XSetErrorHandler (old_handler);
+               old_handler = 0;
+@@ -532,7 +532,7 @@ server_xscreensaver_version (Display *dp
+       char *v = 0;
+       XGetWindowProperty (dpy, window, XA_SCREENSAVER_VERSION, 0, 1,
+ 			  False, XA_STRING, &type, &format, &nitems,
+-			  &bytesafter, (unsigned char **) &v);
++			  &bytesafter, &v);
+       if (v)
+ 	{
+ 	  *version_ret = strdup (v);
+@@ -548,7 +548,7 @@ server_xscreensaver_version (Display *dp
+ 
+       XGetWindowProperty (dpy, window, XA_SCREENSAVER_ID, 0, 512,
+ 			  False, XA_STRING, &type, &format, &nitems,
+-			  &bytesafter, (unsigned char **) &id);
++			  &bytesafter, &id);
+       if (id && *id)
+ 	{
+ 	  const char *old_tag = " on host ";