From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 12 03:20:13 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 45C1E16A400 for ; Wed, 12 Apr 2006 03:20:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2D5543D4C for ; Wed, 12 Apr 2006 03:20:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3C3KCtR094857 for ; Wed, 12 Apr 2006 03:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3C3KC12094856; Wed, 12 Apr 2006 03:20:12 GMT (envelope-from gnats) Resent-Date: Wed, 12 Apr 2006 03:20:12 GMT Resent-Message-Id: <200604120320.k3C3KC12094856@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Botero-Lowry Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 011B716A403; Wed, 12 Apr 2006 03:10:22 +0000 (UTC) (envelope-from alex@foxybanana.com) Received: from ultrasuede.reed.edu (ultrasuede.reed.edu [134.10.2.46]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9158143D45; Wed, 12 Apr 2006 03:10:21 +0000 (GMT) (envelope-from alex@foxybanana.com) Received: from Laptop.mine.box (c029h217.dorm.reed.edu [134.10.29.217]) by ultrasuede.reed.edu (8.13.6/8.13.6) with ESMTP id k3C3AHau004755 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Tue, 11 Apr 2006 20:10:17 -0700 Received: from Laptop.mine.box (localhost [127.0.0.1]) by Laptop.mine.box (8.13.4/8.13.4) with ESMTP id k3C39TQT006527; Tue, 11 Apr 2006 20:09:29 -0700 (PDT) (envelope-from alex@Laptop.mine.box) Received: (from alex@localhost) by Laptop.mine.box (8.13.4/8.13.4/Submit) id k3C39TZW006526; Tue, 11 Apr 2006 20:09:29 -0700 (PDT) (envelope-from alex) Message-Id: <200604120309.k3C39TZW006526@Laptop.mine.box> Date: Tue, 11 Apr 2006 20:09:29 -0700 (PDT) From: Alexander Botero-Lowry To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: nobutaka@FreeBSD.org Subject: ports/95639: [PATCH] multimedia/libxine: Lots of cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2006 03:20:13 -0000 >Number: 95639 >Category: ports >Synopsis: [PATCH] multimedia/libxine: Lots of cleanup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Apr 12 03:20:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alexander Botero-Lowry >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD Laptop.mine.box 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Feb 7 19:06:16 PST >Description: - Fix over forty portlint(1) warnings - ditch USE_REINPLACE - use DATADIR macro - Make WITHOUT knobs actually disable features with configure - Rename all the patches to the current format Added file(s): - files/patch-src_input_input_cdda.c - files/patch-src_libffmpeg_libavcodec_h263.c - files/patch-src_libffmpeg_libavcodec_msmpeg4.c - files/patch-src_libffmpeg_libavcodev_mpeg12.c - files/patch-src_libreal_audio_decoder.c - files/patch-src_libreal_xine_decoder.c - files/patch-src_post_deinterlace_plugins_tomsmocomp_tomsmocompmacros.h - files/patch-src_xine-engine_xine_internal.h Removed file(s): - files/patch-src:input:input_cdda.c - files/patch-src:libffmpeg:libavcodec:h263.c - files/patch-src:libffmpeg:libavcodec:mpeg12.c - files/patch-src:libffmpeg:libavcodec:msmpeg4.c - files/patch-src:libreal:audio_decoder.c - files/patch-src:libreal:xine_decoder.c - files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h - files/patch-src:xine-engine:xine_internal.h Port maintainer (nobutaka@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- libxine-1.1.1_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/Makefile /usr/home/alex/libxine/Makefile --- /usr/ports/multimedia/libxine/Makefile Sat Feb 25 20:38:13 2006 +++ /usr/home/alex/libxine/Makefile Tue Apr 11 20:04:43 2006 @@ -41,7 +41,6 @@ USE_GMAKE= yes USE_GL= yes USE_SDL= sdl -USE_REINPLACE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CFLAGS="${CFLAGS} -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -68,6 +67,7 @@ PLIST_SUB+= WITH_ARTS="" .else PLIST_SUB+= WITH_ARTS="@comment " +CONFIGURE_ARGS+= --disable-arts --disable-artstest .endif .if !defined(WITHOUT_CACA) && (exists(${LOCALBASE}/lib/libcaca.a) || defined(WITH_CACA)) @@ -75,6 +75,7 @@ PLIST_SUB+= WITH_CACA="" .else PLIST_SUB+= WITH_CACA="@comment " +CONFIGURE_ARGS+= --disable-caca --disable-cacatest .endif .if !defined(WITHOUT_ESOUND) && (${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)) @@ -82,6 +83,7 @@ PLIST_SUB+= WITH_ESOUND="" .else PLIST_SUB+= WITH_ESOUND="@comment " +CONFIGURE_ARGS+= --disable-esd --disable-esdtest .endif .if !defined(WITHOUT_GNOMEVFS2) && (${HAVE_GNOME:Mgnomevfs2} != "" || defined(WITH_GNOMEVFS2)) @@ -89,6 +91,7 @@ PLIST_SUB+= WITH_GNOMEVFS2="" .else PLIST_SUB+= WITH_GNOMEVFS2="@comment " +CONFIGURE_ARGS+= --disable-gnome .endif .if !defined(WITHOUT_POLYPAUDIO) && (exists(${LOCALBASE}/lib/libpolyp-0.7.so.0) || defined(WITH_POLYPAUDIO)) @@ -96,12 +99,14 @@ PLIST_SUB+= WITH_POLYPAUDIO="" .else PLIST_SUB+= WITH_POLYPAUDIO="@comment " +CONFIGURE_ARGS+= --disable-polypaudio .endif .if ${ARCH} == "i386" PLIST_SUB+= WITH_VIDIX="" .else PLIST_SUB+= WITH_VIDIX="@comment " +CONFIGURE_ARGS+= --disable-vidix .endif .if !defined(WITHOUT_XVMC) && (exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) || defined(WITH_XVMC)) @@ -117,6 +122,7 @@ PLIST_SUB+= WITH_THEORA="" .else PLIST_SUB+= WITH_THEORA="@comment " +CONFIGURE_ARGS+= --disable-theora --disable-theoratest .endif .if !defined(WITHOUT_SMB) && (exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB)) @@ -124,6 +130,7 @@ PLIST_SUB+= WITH_SMB="" .else PLIST_SUB+= WITH_SMB="@comment " +CONFIGURE_ARGS+= --disable-samba .endif pre-everything:: diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:input:input_cdda.c /usr/home/alex/libxine/files/patch-src:input:input_cdda.c --- /usr/ports/multimedia/libxine/files/patch-src:input:input_cdda.c Sat Dec 10 13:05:06 2005 +++ /usr/home/alex/libxine/files/patch-src:input:input_cdda.c Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- src/input/input_cdda.c.orig Sun Dec 11 03:34:00 2005 -+++ src/input/input_cdda.c Sun Dec 11 03:34:07 2005 -@@ -32,7 +32,7 @@ - #include - - #include --#ifdef SYS_PARAM_H -+#ifdef HAVE_SYS_PARAM_H - #include - #endif - #ifdef HAVE_DIRENT_H diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c /usr/home/alex/libxine/files/patch-src:libffmpeg:libavcodec:h263.c --- /usr/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c Thu Dec 15 09:19:47 2005 +++ /usr/home/alex/libxine/files/patch-src:libffmpeg:libavcodec:h263.c Wed Dec 31 16:00:00 1969 @@ -1,31 +0,0 @@ ---- src/libffmpeg/libavcodec/h263.c.orig Fri Dec 16 00:57:15 2005 -+++ src/libffmpeg/libavcodec/h263.c Fri Dec 16 01:00:23 2005 -@@ -66,8 +66,8 @@ - static int h263p_decode_umotion(MpegEncContext * s, int pred); - static int h263_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded); --static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); --static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, -+static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); -+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded, int intra, int rvlc); - static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, - uint8_t *scan_table); -@@ -4682,7 +4682,7 @@ - * @param dir_ptr the prediction direction will be stored here - * @return the quantized dc - */ --static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) -+static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) - { - int level, code; - -@@ -4727,7 +4727,7 @@ - * decodes a block. - * @return <0 if an error occured - */ --static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, -+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded, int intra, int rvlc) - { - int level, i, last, run; diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c /usr/home/alex/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c --- /usr/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c Thu Dec 15 09:19:47 2005 +++ /usr/home/alex/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c Wed Dec 31 16:00:00 1969 @@ -1,94 +0,0 @@ ---- src/libffmpeg/libavcodec/mpeg12.c.orig Fri Dec 16 01:04:27 2005 -+++ src/libffmpeg/libavcodec/mpeg12.c Fri Dec 16 01:12:18 2005 -@@ -65,21 +65,21 @@ - int component); - static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added - #endif //CONFIG_ENCODERS --static inline int mpeg1_decode_block_inter(MpegEncContext *s, -+static int mpeg1_decode_block_inter(MpegEncContext *s, - DCTELEM *block, - int n); --static inline int mpeg1_decode_block_intra(MpegEncContext *s, -+static int mpeg1_decode_block_intra(MpegEncContext *s, - DCTELEM *block, - int n); --static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); --static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, -+static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); -+static int mpeg2_decode_block_non_intra(MpegEncContext *s, - DCTELEM *block, - int n); --static inline int mpeg2_decode_block_intra(MpegEncContext *s, -+static int mpeg2_decode_block_intra(MpegEncContext *s, - DCTELEM *block, - int n); --static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); --static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); -+static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); -+static int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); - static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); - static void exchange_uv(MpegEncContext *s); - -@@ -1505,7 +1505,7 @@ - return diff; - } - --static inline int mpeg1_decode_block_intra(MpegEncContext *s, -+static int mpeg1_decode_block_intra(MpegEncContext *s, - DCTELEM *block, - int n) - { -@@ -1578,7 +1578,7 @@ - return 0; - } - --static inline int mpeg1_decode_block_inter(MpegEncContext *s, -+static int mpeg1_decode_block_inter(MpegEncContext *s, - DCTELEM *block, - int n) - { -@@ -1656,7 +1656,7 @@ - return 0; - } - --static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) -+static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) - { - int level, i, j, run; - RLTable *rl = &rl_mpeg1; -@@ -1728,7 +1728,7 @@ - } - - --static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, -+static int mpeg2_decode_block_non_intra(MpegEncContext *s, - DCTELEM *block, - int n) - { -@@ -1809,7 +1809,7 @@ - return 0; - } - --static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, -+static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, - DCTELEM *block, - int n) - { -@@ -1872,7 +1872,7 @@ - } - - --static inline int mpeg2_decode_block_intra(MpegEncContext *s, -+static int mpeg2_decode_block_intra(MpegEncContext *s, - DCTELEM *block, - int n) - { -@@ -1952,7 +1952,7 @@ - return 0; - } - --static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, -+static int mpeg2_fast_decode_block_intra(MpegEncContext *s, - DCTELEM *block, - int n) - { diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c /usr/home/alex/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c --- /usr/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c Thu Dec 15 09:19:47 2005 +++ /usr/home/alex/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c Wed Dec 31 16:00:00 1969 @@ -1,20 +0,0 @@ ---- src/libffmpeg/libavcodec/msmpeg4.c.orig Fri Dec 16 01:17:22 2005 -+++ src/libffmpeg/libavcodec/msmpeg4.c Fri Dec 16 01:18:00 2005 -@@ -60,7 +60,7 @@ - static uint32_t v2_dc_chroma_table[512][2]; - - static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n); --static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, -+static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded, const uint8_t *scantable); - static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); - static int msmpeg4_decode_motion(MpegEncContext * s, -@@ -1659,7 +1659,7 @@ - return 0; - } - //#define ERROR_DETAILS --static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, -+static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, - int n, int coded, const uint8_t *scan_table) - { - int level, i, last, run, run_diff; diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:libreal:audio_decoder.c /usr/home/alex/libxine/files/patch-src:libreal:audio_decoder.c --- /usr/ports/multimedia/libxine/files/patch-src:libreal:audio_decoder.c Sat Dec 10 13:05:06 2005 +++ /usr/home/alex/libxine/files/patch-src:libreal:audio_decoder.c Wed Dec 31 16:00:00 1969 @@ -1,48 +0,0 @@ ---- src/libreal/audio_decoder.c.orig Sun Oct 23 07:09:47 2005 -+++ src/libreal/audio_decoder.c Sun Dec 11 02:49:37 2005 -@@ -48,6 +48,14 @@ - #include "buffer.h" - #include "xineutils.h" - -+#if defined(__FreeBSD__) -+void ___brk_addr(void) {exit(0);} -+void __ctype_b(void) {exit(0);} -+char **__environ={NULL}; -+#undef stderr -+FILE *stderr=NULL; -+#endif -+ - typedef struct { - audio_decoder_class_t decoder_class; - -@@ -709,24 +717,12 @@ - - /* try some auto-detection */ - -- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/local/RealPlayer8/Codecs"; -- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/RealPlayer8/Codecs"; -- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/RealPlayer8/Codecs"; -- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/opt/RealPlayer8/Codecs"; -- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs"; -- if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs"; -- if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs"; -- if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/codecs"; -- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/win32"; -+ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) -+ default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs"; -+ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) -+ default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs"; -+ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) -+ default_real_codec_path = "/usr/local/lib/win32"; - - real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", - default_real_codec_path, diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:libreal:xine_decoder.c /usr/home/alex/libxine/files/patch-src:libreal:xine_decoder.c --- /usr/ports/multimedia/libxine/files/patch-src:libreal:xine_decoder.c Sat Dec 10 13:05:06 2005 +++ /usr/home/alex/libxine/files/patch-src:libreal:xine_decoder.c Wed Dec 31 16:00:00 1969 @@ -1,50 +0,0 @@ ---- src/libreal/xine_decoder.c.orig Thu Oct 27 23:58:56 2005 -+++ src/libreal/xine_decoder.c Sun Dec 11 02:52:23 2005 -@@ -47,6 +47,14 @@ - #include "buffer.h" - #include "xineutils.h" - -+#if defined(__FreeBSD__) -+void ___brk_addr(void) {exit(0);} -+void __ctype_b(void) {exit(0);} -+char **__environ={NULL}; -+#undef stderr -+FILE *stderr=NULL; -+#endif -+ - typedef struct { - video_decoder_class_t decoder_class; - -@@ -589,25 +597,13 @@ - - /* try some auto-detection */ - -- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/local/RealPlayer8/Codecs"; -- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/RealPlayer8/Codecs"; -- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/RealPlayer8/Codecs"; -- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/opt/RealPlayer8/Codecs"; -- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs"; -- if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs"; -- if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs"; -- if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/codecs"; -- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) -- default_real_codec_path = "/usr/lib/win32"; -- -+ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) -+ default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs"; -+ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) -+ default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs"; -+ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) -+ default_real_codec_path = "/usr/local/lib/win32"; -+ - real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", - default_real_codec_path, - _("path to RealPlayer codecs"), diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h /usr/home/alex/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h --- /usr/ports/multimedia/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h Sat Dec 10 13:05:06 2005 +++ /usr/home/alex/libxine/files/patch-src:post:deinterlace:plugins:tomsmocomp:tomsmocompmacros.h Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ ---- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig Sat Jul 30 03:14:40 2005 -+++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h Sun Dec 11 02:54:16 2005 -@@ -1,8 +1,6 @@ - #include - #include --#ifdef HAVE_MALLOC_H --#include --#endif -+#include - - #define USE_FOR_DSCALER - diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h /usr/home/alex/libxine/files/patch-src:xine-engine:xine_internal.h --- /usr/ports/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h Sat Oct 1 11:20:02 2005 +++ /usr/home/alex/libxine/files/patch-src:xine-engine:xine_internal.h Wed Dec 31 16:00:00 1969 @@ -1,80 +0,0 @@ ---- src/xine-engine/xine_internal.h.orig Tue Apr 26 17:09:12 2005 -+++ src/xine-engine/xine_internal.h Sat Apr 30 14:16:33 2005 -@@ -70,6 +70,77 @@ - # include - #endif - -+#ifndef INT8_MIN -+#define INT8_MIN (-0x7f-1) -+#endif -+ -+#ifndef INT8_MAX -+#define INT8_MAX 0x7f -+#endif -+ -+#ifndef INT16_MAX -+#define INT16_MAX 0x7fff -+#endif -+ -+#ifndef INT16_MIN -+#define INT16_MIN (-0x7fff-1) -+#endif -+ -+#ifndef INT32_MAX -+#define INT32_MAX 0x7fffffff -+#endif -+ -+#ifndef INT32_MIN -+#define INT32_MIN (-0x7fffffff-1) -+#endif -+ -+#ifndef PRIiMAX -+#define PRIiMAX "lld" -+typedef long long intmax_t; -+#endif -+ -+#ifndef PRId64 -+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) -+#define PRId64 "ld" -+#else if defined(__i386__) || defined(__powerpc__) -+#define PRId64 "lld" -+#endif -+#endif -+ -+#ifndef PRIdMAX -+#define PRIdMAX "lld" -+#endif -+ -+#ifndef SCNdMAX -+#define SCNdMAX "lld" -+#endif -+ -+#ifndef PRIx32 -+#define PRIx32 "x" -+#endif -+ -+#ifndef PRIx16 -+#define PRIx16 "x" -+#endif -+ -+#ifndef PRIx8 -+#define PRIx8 "x" -+#endif -+ -+#ifndef PRIXMAX -+#define PRIXMAX "llX" -+#endif -+ -+#ifndef PRIxMAX -+#define PRIxMAX "llx" -+#endif -+ -+#ifndef UINT64_C -+#define UINT64_C(c) (c ## ULL) -+#endif -+ -+ -+ - - #define XINE_MAX_EVENT_LISTENERS 50 - #define XINE_MAX_EVENT_TYPES 100 diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_input_input_cdda.c /usr/home/alex/libxine/files/patch-src_input_input_cdda.c --- /usr/ports/multimedia/libxine/files/patch-src_input_input_cdda.c Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_input_input_cdda.c Tue Apr 11 20:04:43 2006 @@ -0,0 +1,11 @@ +--- src/input/input_cdda.c.orig Sun Dec 11 03:34:00 2005 ++++ src/input/input_cdda.c Sun Dec 11 03:34:07 2005 +@@ -32,7 +32,7 @@ + #include + + #include +-#ifdef SYS_PARAM_H ++#ifdef HAVE_SYS_PARAM_H + #include + #endif + #ifdef HAVE_DIRENT_H diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_h263.c /usr/home/alex/libxine/files/patch-src_libffmpeg_libavcodec_h263.c --- /usr/ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_h263.c Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_libffmpeg_libavcodec_h263.c Tue Apr 11 20:04:43 2006 @@ -0,0 +1,31 @@ +--- src/libffmpeg/libavcodec/h263.c.orig Fri Dec 16 00:57:15 2005 ++++ src/libffmpeg/libavcodec/h263.c Fri Dec 16 01:00:23 2005 +@@ -66,8 +66,8 @@ + static int h263p_decode_umotion(MpegEncContext * s, int pred); + static int h263_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded); +-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); +-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); ++static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded, int intra, int rvlc); + static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, + uint8_t *scan_table); +@@ -4682,7 +4682,7 @@ + * @param dir_ptr the prediction direction will be stored here + * @return the quantized dc + */ +-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) ++static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) + { + int level, code; + +@@ -4727,7 +4727,7 @@ + * decodes a block. + * @return <0 if an error occured + */ +-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded, int intra, int rvlc) + { + int level, i, last, run; diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_msmpeg4.c /usr/home/alex/libxine/files/patch-src_libffmpeg_libavcodec_msmpeg4.c --- /usr/ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_msmpeg4.c Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_libffmpeg_libavcodec_msmpeg4.c Tue Apr 11 20:04:43 2006 @@ -0,0 +1,20 @@ +--- src/libffmpeg/libavcodec/msmpeg4.c.orig Fri Dec 16 01:17:22 2005 ++++ src/libffmpeg/libavcodec/msmpeg4.c Fri Dec 16 01:18:00 2005 +@@ -60,7 +60,7 @@ + static uint32_t v2_dc_chroma_table[512][2]; + + static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n); +-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded, const uint8_t *scantable); + static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr); + static int msmpeg4_decode_motion(MpegEncContext * s, +@@ -1659,7 +1659,7 @@ + return 0; + } + //#define ERROR_DETAILS +-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, ++static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, + int n, int coded, const uint8_t *scan_table) + { + int level, i, last, run, run_diff; diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodev_mpeg12.c /usr/home/alex/libxine/files/patch-src_libffmpeg_libavcodev_mpeg12.c --- /usr/ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodev_mpeg12.c Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_libffmpeg_libavcodev_mpeg12.c Tue Apr 11 20:04:43 2006 @@ -0,0 +1,94 @@ +--- src/libffmpeg/libavcodec/mpeg12.c.orig Fri Dec 16 01:04:27 2005 ++++ src/libffmpeg/libavcodec/mpeg12.c Fri Dec 16 01:12:18 2005 +@@ -65,21 +65,21 @@ + int component); + static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added + #endif //CONFIG_ENCODERS +-static inline int mpeg1_decode_block_inter(MpegEncContext *s, ++static int mpeg1_decode_block_inter(MpegEncContext *s, + DCTELEM *block, + int n); +-static inline int mpeg1_decode_block_intra(MpegEncContext *s, ++static int mpeg1_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n); +-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); +-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, ++static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n); ++static int mpeg2_decode_block_non_intra(MpegEncContext *s, + DCTELEM *block, + int n); +-static inline int mpeg2_decode_block_intra(MpegEncContext *s, ++static int mpeg2_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n); +-static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); +-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); ++static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n); ++static int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n); + static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred); + static void exchange_uv(MpegEncContext *s); + +@@ -1505,7 +1505,7 @@ + return diff; + } + +-static inline int mpeg1_decode_block_intra(MpegEncContext *s, ++static int mpeg1_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1578,7 +1578,7 @@ + return 0; + } + +-static inline int mpeg1_decode_block_inter(MpegEncContext *s, ++static int mpeg1_decode_block_inter(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1656,7 +1656,7 @@ + return 0; + } + +-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) ++static int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n) + { + int level, i, j, run; + RLTable *rl = &rl_mpeg1; +@@ -1728,7 +1728,7 @@ + } + + +-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, ++static int mpeg2_decode_block_non_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1809,7 +1809,7 @@ + return 0; + } + +-static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, ++static int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1872,7 +1872,7 @@ + } + + +-static inline int mpeg2_decode_block_intra(MpegEncContext *s, ++static int mpeg2_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { +@@ -1952,7 +1952,7 @@ + return 0; + } + +-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, ++static int mpeg2_fast_decode_block_intra(MpegEncContext *s, + DCTELEM *block, + int n) + { diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_libreal_audio_decoder.c /usr/home/alex/libxine/files/patch-src_libreal_audio_decoder.c --- /usr/ports/multimedia/libxine/files/patch-src_libreal_audio_decoder.c Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_libreal_audio_decoder.c Tue Apr 11 20:04:43 2006 @@ -0,0 +1,48 @@ +--- src/libreal/audio_decoder.c.orig Sun Oct 23 07:09:47 2005 ++++ src/libreal/audio_decoder.c Sun Dec 11 02:49:37 2005 +@@ -48,6 +48,14 @@ + #include "buffer.h" + #include "xineutils.h" + ++#if defined(__FreeBSD__) ++void ___brk_addr(void) {exit(0);} ++void __ctype_b(void) {exit(0);} ++char **__environ={NULL}; ++#undef stderr ++FILE *stderr=NULL; ++#endif ++ + typedef struct { + audio_decoder_class_t decoder_class; + +@@ -709,24 +717,12 @@ + + /* try some auto-detection */ + +- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/local/RealPlayer8/Codecs"; +- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/RealPlayer8/Codecs"; +- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/RealPlayer8/Codecs"; +- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/opt/RealPlayer8/Codecs"; +- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs"; +- if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs"; +- if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs"; +- if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/codecs"; +- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/win32"; ++ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) ++ default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs"; ++ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) ++ default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs"; ++ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) ++ default_real_codec_path = "/usr/local/lib/win32"; + + real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", + default_real_codec_path, diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_libreal_xine_decoder.c /usr/home/alex/libxine/files/patch-src_libreal_xine_decoder.c --- /usr/ports/multimedia/libxine/files/patch-src_libreal_xine_decoder.c Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_libreal_xine_decoder.c Tue Apr 11 20:04:43 2006 @@ -0,0 +1,50 @@ +--- src/libreal/xine_decoder.c.orig Thu Oct 27 23:58:56 2005 ++++ src/libreal/xine_decoder.c Sun Dec 11 02:52:23 2005 +@@ -47,6 +47,14 @@ + #include "buffer.h" + #include "xineutils.h" + ++#if defined(__FreeBSD__) ++void ___brk_addr(void) {exit(0);} ++void __ctype_b(void) {exit(0);} ++char **__environ={NULL}; ++#undef stderr ++FILE *stderr=NULL; ++#endif ++ + typedef struct { + video_decoder_class_t decoder_class; + +@@ -589,25 +597,13 @@ + + /* try some auto-detection */ + +- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/local/RealPlayer8/Codecs"; +- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/RealPlayer8/Codecs"; +- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/RealPlayer8/Codecs"; +- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/opt/RealPlayer8/Codecs"; +- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/RealPlayer9/users/Real/Codecs"; +- if (!stat ("/usr/lib64/RealPlayer8/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib64/RealPlayer8/Codecs"; +- if (!stat ("/usr/lib64/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib64/RealPlayer9/users/Real/Codecs"; +- if (!stat ("/usr/lib/codecs/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/codecs"; +- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s)) +- default_real_codec_path = "/usr/lib/win32"; +- ++ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s)) ++ default_real_codec_path = "/usr/local/lib/RealPlayer8/Codecs"; ++ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s)) ++ default_real_codec_path = "/usr/local/lib/RealPlayer9/users/Real/Codecs"; ++ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s)) ++ default_real_codec_path = "/usr/local/lib/win32"; ++ + real_codec_path = config->register_string (config, "decoder.external.real_codecs_path", + default_real_codec_path, + _("path to RealPlayer codecs"), diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_post_deinterlace_plugins_tomsmocomp_tomsmocompmacros.h /usr/home/alex/libxine/files/patch-src_post_deinterlace_plugins_tomsmocomp_tomsmocompmacros.h --- /usr/ports/multimedia/libxine/files/patch-src_post_deinterlace_plugins_tomsmocomp_tomsmocompmacros.h Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_post_deinterlace_plugins_tomsmocomp_tomsmocompmacros.h Tue Apr 11 20:04:43 2006 @@ -0,0 +1,12 @@ +--- src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h.orig Sat Jul 30 03:14:40 2005 ++++ src/post/deinterlace/plugins/tomsmocomp/tomsmocompmacros.h Sun Dec 11 02:54:16 2005 +@@ -1,8 +1,6 @@ + #include + #include +-#ifdef HAVE_MALLOC_H +-#include +-#endif ++#include + + #define USE_FOR_DSCALER + diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/files/patch-src_xine-engine_xine_internal.h /usr/home/alex/libxine/files/patch-src_xine-engine_xine_internal.h --- /usr/ports/multimedia/libxine/files/patch-src_xine-engine_xine_internal.h Wed Dec 31 16:00:00 1969 +++ /usr/home/alex/libxine/files/patch-src_xine-engine_xine_internal.h Tue Apr 11 20:04:43 2006 @@ -0,0 +1,80 @@ +--- src/xine-engine/xine_internal.h.orig Tue Apr 26 17:09:12 2005 ++++ src/xine-engine/xine_internal.h Sat Apr 30 14:16:33 2005 +@@ -70,6 +70,77 @@ + # include + #endif + ++#ifndef INT8_MIN ++#define INT8_MIN (-0x7f-1) ++#endif ++ ++#ifndef INT8_MAX ++#define INT8_MAX 0x7f ++#endif ++ ++#ifndef INT16_MAX ++#define INT16_MAX 0x7fff ++#endif ++ ++#ifndef INT16_MIN ++#define INT16_MIN (-0x7fff-1) ++#endif ++ ++#ifndef INT32_MAX ++#define INT32_MAX 0x7fffffff ++#endif ++ ++#ifndef INT32_MIN ++#define INT32_MIN (-0x7fffffff-1) ++#endif ++ ++#ifndef PRIiMAX ++#define PRIiMAX "lld" ++typedef long long intmax_t; ++#endif ++ ++#ifndef PRId64 ++#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) ++#define PRId64 "ld" ++#else if defined(__i386__) || defined(__powerpc__) ++#define PRId64 "lld" ++#endif ++#endif ++ ++#ifndef PRIdMAX ++#define PRIdMAX "lld" ++#endif ++ ++#ifndef SCNdMAX ++#define SCNdMAX "lld" ++#endif ++ ++#ifndef PRIx32 ++#define PRIx32 "x" ++#endif ++ ++#ifndef PRIx16 ++#define PRIx16 "x" ++#endif ++ ++#ifndef PRIx8 ++#define PRIx8 "x" ++#endif ++ ++#ifndef PRIXMAX ++#define PRIXMAX "llX" ++#endif ++ ++#ifndef PRIxMAX ++#define PRIxMAX "llx" ++#endif ++ ++#ifndef UINT64_C ++#define UINT64_C(c) (c ## ULL) ++#endif ++ ++ ++ + + #define XINE_MAX_EVENT_LISTENERS 50 + #define XINE_MAX_EVENT_TYPES 100 diff -ruN --exclude=CVS /usr/ports/multimedia/libxine/pkg-plist /usr/home/alex/libxine/pkg-plist --- /usr/ports/multimedia/libxine/pkg-plist Sat Jan 21 18:29:58 2006 +++ /usr/home/alex/libxine/pkg-plist Tue Apr 11 20:04:43 2006 @@ -167,42 +167,42 @@ share/locale/pl/LC_MESSAGES/libxine1.mo share/locale/pt_BR/LC_MESSAGES/libxine1.mo share/locale/sk/LC_MESSAGES/libxine1.mo -share/xine/libxine1/fonts/cc-16.xinefont.gz -share/xine/libxine1/fonts/cc-20.xinefont.gz -share/xine/libxine1/fonts/cc-24.xinefont.gz -share/xine/libxine1/fonts/cc-32.xinefont.gz -share/xine/libxine1/fonts/cc-48.xinefont.gz -share/xine/libxine1/fonts/cc-64.xinefont.gz -share/xine/libxine1/fonts/cci-16.xinefont.gz -share/xine/libxine1/fonts/cci-20.xinefont.gz -share/xine/libxine1/fonts/cci-24.xinefont.gz -share/xine/libxine1/fonts/cci-32.xinefont.gz -share/xine/libxine1/fonts/cci-48.xinefont.gz -share/xine/libxine1/fonts/cci-64.xinefont.gz -share/xine/libxine1/fonts/cetus-16.xinefont.gz -share/xine/libxine1/fonts/cetus-20.xinefont.gz -share/xine/libxine1/fonts/cetus-24.xinefont.gz -share/xine/libxine1/fonts/cetus-32.xinefont.gz -share/xine/libxine1/fonts/cetus-48.xinefont.gz -share/xine/libxine1/fonts/cetus-64.xinefont.gz -share/xine/libxine1/fonts/mono-16.xinefont.gz -share/xine/libxine1/fonts/mono-20.xinefont.gz -share/xine/libxine1/fonts/mono-24.xinefont.gz -share/xine/libxine1/fonts/mono-32.xinefont.gz -share/xine/libxine1/fonts/mono-48.xinefont.gz -share/xine/libxine1/fonts/mono-64.xinefont.gz -share/xine/libxine1/fonts/sans-16.xinefont.gz -share/xine/libxine1/fonts/sans-20.xinefont.gz -share/xine/libxine1/fonts/sans-24.xinefont.gz -share/xine/libxine1/fonts/sans-32.xinefont.gz -share/xine/libxine1/fonts/sans-48.xinefont.gz -share/xine/libxine1/fonts/sans-64.xinefont.gz -share/xine/libxine1/fonts/serif-16.xinefont.gz -share/xine/libxine1/fonts/serif-20.xinefont.gz -share/xine/libxine1/fonts/serif-24.xinefont.gz -share/xine/libxine1/fonts/serif-32.xinefont.gz -share/xine/libxine1/fonts/serif-48.xinefont.gz -share/xine/libxine1/fonts/serif-64.xinefont.gz +%%DATADIR%%/libxine1/fonts/cc-16.xinefont.gz +%%DATADIR%%/libxine1/fonts/cc-20.xinefont.gz +%%DATADIR%%/libxine1/fonts/cc-24.xinefont.gz +%%DATADIR%%/libxine1/fonts/cc-32.xinefont.gz +%%DATADIR%%/libxine1/fonts/cc-48.xinefont.gz +%%DATADIR%%/libxine1/fonts/cc-64.xinefont.gz +%%DATADIR%%/libxine1/fonts/cci-16.xinefont.gz +%%DATADIR%%/libxine1/fonts/cci-20.xinefont.gz +%%DATADIR%%/libxine1/fonts/cci-24.xinefont.gz +%%DATADIR%%/libxine1/fonts/cci-32.xinefont.gz +%%DATADIR%%/libxine1/fonts/cci-48.xinefont.gz +%%DATADIR%%/libxine1/fonts/cci-64.xinefont.gz +%%DATADIR%%/libxine1/fonts/cetus-16.xinefont.gz +%%DATADIR%%/libxine1/fonts/cetus-20.xinefont.gz +%%DATADIR%%/libxine1/fonts/cetus-24.xinefont.gz +%%DATADIR%%/libxine1/fonts/cetus-32.xinefont.gz +%%DATADIR%%/libxine1/fonts/cetus-48.xinefont.gz +%%DATADIR%%/libxine1/fonts/cetus-64.xinefont.gz +%%DATADIR%%/libxine1/fonts/mono-16.xinefont.gz +%%DATADIR%%/libxine1/fonts/mono-20.xinefont.gz +%%DATADIR%%/libxine1/fonts/mono-24.xinefont.gz +%%DATADIR%%/libxine1/fonts/mono-32.xinefont.gz +%%DATADIR%%/libxine1/fonts/mono-48.xinefont.gz +%%DATADIR%%/libxine1/fonts/mono-64.xinefont.gz +%%DATADIR%%/libxine1/fonts/sans-16.xinefont.gz +%%DATADIR%%/libxine1/fonts/sans-20.xinefont.gz +%%DATADIR%%/libxine1/fonts/sans-24.xinefont.gz +%%DATADIR%%/libxine1/fonts/sans-32.xinefont.gz +%%DATADIR%%/libxine1/fonts/sans-48.xinefont.gz +%%DATADIR%%/libxine1/fonts/sans-64.xinefont.gz +%%DATADIR%%/libxine1/fonts/serif-16.xinefont.gz +%%DATADIR%%/libxine1/fonts/serif-20.xinefont.gz +%%DATADIR%%/libxine1/fonts/serif-24.xinefont.gz +%%DATADIR%%/libxine1/fonts/serif-32.xinefont.gz +%%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz +%%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz @dirrm include/xine @dirrm lib/xine/plugins/1.1.1/vidix @dirrm lib/xine/plugins/1.1.1/post @@ -214,6 +214,6 @@ @dirrm %%DOCSDIR%% @dirrmtry share/locale/pl_PL/LC_MESSAGES @dirrmtry share/locale/pl_PL -@dirrm share/xine/libxine1/fonts -@dirrm share/xine/libxine1 -@dirrm share/xine +@dirrm %%DATADIR%%/libxine1/fonts +@dirrm %%DATADIR%%/libxine1 +@dirrm %%DATADIR%% --- libxine-1.1.1_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: