aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2004-12-30 08:39:19 +0800
committernobutaka <nobutaka@FreeBSD.org>2004-12-30 08:39:19 +0800
commit8935bd10dbfb4d72d94d184702856f30c8eb5b08 (patch)
tree782ce7afefa58887258783aa397c4d4831f22423
parente984664989c357c7040d825cbf9dc5685544cbca (diff)
downloadfreebsd-ports-gnome-8935bd10dbfb4d72d94d184702856f30c8eb5b08.tar.gz
freebsd-ports-gnome-8935bd10dbfb4d72d94d184702856f30c8eb5b08.tar.zst
freebsd-ports-gnome-8935bd10dbfb4d72d94d184702856f30c8eb5b08.zip
Update to 1.0. (At last!)
-rw-r--r--multimedia/libxine/Makefile18
-rw-r--r--multimedia/libxine/distinfo4
-rw-r--r--multimedia/libxine/files/patch-configure11
-rw-r--r--multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c52
-rw-r--r--multimedia/libxine/files/patch-src:liba52:Makefile.in51
-rw-r--r--multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c12
-rw-r--r--multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c37
-rw-r--r--multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c19
-rw-r--r--multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c26
-rw-r--r--multimedia/libxine/files/patch-src:libmad:Makefile.in62
-rw-r--r--multimedia/libxine/files/patch-src:libreal:audio_decoder.c46
-rw-r--r--multimedia/libxine/files/patch-src:libreal:xine_decoder.c73
-rw-r--r--multimedia/libxine/files/patch-src:post:goom:zoom_filter_xmmx.c11
-rw-r--r--multimedia/libxine/pkg-plist11
14 files changed, 212 insertions, 221 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index c1d4c29aca10..ead6043a2bf0 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,13 +6,12 @@
#
PORTNAME= xine
-PORTVERSION= 1.0.r5
-PORTREVISION= 3
-CATEGORIES= multimedia
+PORTVERSION= 1.0
+CATEGORIES= multimedia ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= lib
-DISTNAME= ${PORTNAME}-lib-1-rc5
+DISTNAME= ${PORTNAME}-lib-1.0
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Libraries for xine multimedia player
@@ -26,7 +25,9 @@ LIB_DEPENDS= FLAC.5:${PORTSDIR}/audio/flac \
aa.1:${PORTSDIR}/graphics/aalib \
mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
- dvdread.3:${PORTSDIR}/multimedia/libdvdread
+ dvdread.3:${PORTSDIR}/multimedia/libdvdread \
+ freetype.9:${PORTSDIR}/print/freetype2 \
+ fame-0.9.1:${PORTSDIR}/multimedia/libfame
USE_GETTEXT= yes
USE_ICONV= yes
@@ -115,6 +116,13 @@ PLIST_SUB+= WITH_LIBTHEORA=""
PLIST_SUB+= WITH_LIBTHEORA="@comment "
.endif
+.if exists(${LOCALBASE}/lib/libsmbclient.so.0) || defined (WITH_SMB)
+LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+= WITH_SMB=""
+.else
+PLIST_SUB+= WITH_SMB="@comment "
+.endif
+
pre-everything::
@${ECHO_MSG} "===>"
@${ECHO_MSG} "===> You can enable some features by defining following variables."
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 54f0846385dd..c48b1605ba12 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,2 +1,2 @@
-MD5 (xine-lib-1-rc5.tar.gz) = 703c3e68d60524598d4d9e527fe38286
-SIZE (xine-lib-1-rc5.tar.gz) = 7052663
+MD5 (xine-lib-1.0.tar.gz) = 96e5195c366064e7778af44c3e71f43a
+SIZE (xine-lib-1.0.tar.gz) = 7384258
diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure
new file mode 100644
index 000000000000..478c788bafaa
--- /dev/null
+++ b/multimedia/libxine/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig Mon Nov 15 02:57:21 2004
++++ configure Mon Nov 15 02:57:39 2004
+@@ -25382,7 +25382,7 @@
+ "ac_cv_lib_avcodec_pp_get_context" \
+ "ac_cv_lib_postproc_pp_get_context" \
+ "ac_cv_lib_avcodec_register_avcodec"; do
+- $as_unset $i || test "${$i+set}" != set || { $i=; export $i; }
++ $as_unset $i
+ done
+
+ if test "${ac_cv_header_avcodec_h+set}" = set; then
diff --git a/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c b/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c
index 0640ebdca1fa..bbaa4f2006ee 100644
--- a/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c
+++ b/multimedia/libxine/files/patch-src:input:vcd:xineplug_inp_vcd.c
@@ -1,42 +1,7 @@
---- src/input/vcd/xineplug_inp_vcd.c 2004/04/28 10:41:46 1.108
-+++ src/input/vcd/xineplug_inp_vcd.c 2004/07/18 14:47:21 1.109
-@@ -48,6 +48,7 @@
- #define SHORT_PLUGIN_NAME "VCDX"
- #define MRL_PREFIX "vcdx://"
- #define MRL_PREFIX_LEN strlen(MRL_PREFIX)
-+#define MRL_MAX_LEN 1024
-
- #define xine_config_entry_t xine_cfg_entry_t
-
-@@ -465,7 +466,7 @@
- return false;
- }
-
-- count = sscanf (p, "%[^@]@%1[EePpSsTt]%u",
-+ count = sscanf (p, "%1024[^@]@%1[EePpSsTt]%u",
- device_str, type_str, &num);
- itemid->num = num;
-
-@@ -489,7 +490,7 @@
- {
- /* No device/file given, so use the default device and try again. */
- if (NULL == default_vcd_device) return false;
-- strcpy(device_str, default_vcd_device);
-+ strncpy(device_str, default_vcd_device, MRL_MAX_LEN);
- if (p[0] == '@') p++;
- count = sscanf (p, "%1[EePpSsTt]%u", type_str, &num);
- type_str[0] = toupper(type_str[0]);
-@@ -781,7 +782,7 @@
- vcd_class_get_dir (input_class_t *this_gen, const char *filename,
- int *num_files) {
-
-- char intended_vcd_device[1024]="";
-+ char intended_vcd_device[MRL_MAX_LEN+1]="";
- vcdinfo_itemid_t itemid;
-
- vcd_input_class_t *class = (vcd_input_class_t *) this_gen;
-@@ -913,7 +914,7 @@
- static char *
+--- src/input/vcd/xineplug_inp_vcd.c.orig Thu Aug 12 19:04:34 2004
++++ src/input/vcd/xineplug_inp_vcd.c Mon Nov 15 00:50:44 2004
+@@ -923,7 +923,7 @@
+ static const char *
vcd_class_get_identifier (input_class_t *this_gen) {
dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
- return SHORT_PLUGIN_NAME;
@@ -44,12 +9,3 @@
}
/*
-@@ -1425,7 +1426,7 @@
- {
- vcd_input_class_t *class = (vcd_input_class_t *) class_gen;
-
-- char intended_vcd_device[1024]="";
-+ char intended_vcd_device[MRL_MAX_LEN+1]="";
- vcdinfo_itemid_t itemid;
- char *check_mrl=NULL;
- bool used_default;
diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.in b/multimedia/libxine/files/patch-src:liba52:Makefile.in
index 8ab80343b941..908be785a0fa 100644
--- a/multimedia/libxine/files/patch-src:liba52:Makefile.in
+++ b/multimedia/libxine/files/patch-src:liba52:Makefile.in
@@ -1,8 +1,18 @@
---- src/liba52/Makefile.in.orig Sun May 16 11:30:04 2004
-+++ src/liba52/Makefile.in Sun May 16 11:31:08 2004
-@@ -400,25 +400,13 @@
+--- src/liba52/Makefile.in.orig Thu Dec 30 00:56:26 2004
++++ src/liba52/Makefile.in Thu Dec 30 05:21:36 2004
+@@ -75,8 +75,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+ xineplug_decode_a52_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo \
+- crc.lo downmix.lo imdct.lo parse.lo xine_decoder.lo
++am_xineplug_decode_a52_la_OBJECTS = crc.lo xine_decoder.lo
+ xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -510,15 +509,10 @@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
lib_LTLIBRARIES = xineplug_decode_a52.la
-
xineplug_decode_a52_la_SOURCES = \
- bitstream.c \
- bit_allocate.c \
@@ -12,28 +22,21 @@
- parse.c \
xine_decoder.c
-
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB)
+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -ldjbfft
xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ noinst_HEADERS = \
+ a52.h \
+@@ -595,12 +589,7 @@
+ distclean-compile:
+ -rm -f *.tab.c
--noinst_HEADERS = \
-- a52.h \
-- a52_internal.h \
-- bitstream.h \
-- tables.h
--
--subdir = src/liba52
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
-@@ -427,8 +415,7 @@
-
- xineplug_decode_a52_la_DEPENDENCIES = \
- $(top_builddir)/src/xine-engine/libxine.la
--am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo crc.lo \
-- downmix.lo imdct.lo parse.lo xine_decoder.lo
-+am_xineplug_decode_a52_la_OBJECTS = crc.lo xine_decoder.lo
- xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit_allocate.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstream.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/downmix.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imdct.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ .c.o:
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
index 4d3913b8cf1b..643b19e62006 100644
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
+++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
@@ -1,17 +1,15 @@
---- src/libffmpeg/libavcodec/h263.c.orig Sun May 30 19:24:19 2004
-+++ src/libffmpeg/libavcodec/h263.c Sun Aug 1 12:52:11 2004
-@@ -66,8 +66,8 @@
+--- src/libffmpeg/libavcodec/h263.c.orig Sun Sep 12 21:17:13 2004
++++ src/libffmpeg/libavcodec/h263.c Mon Nov 15 01:05:07 2004
+@@ -63,7 +63,7 @@
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 h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr);
#ifdef CONFIG_ENCODERS
-@@ -4548,7 +4548,7 @@
+@@ -3279,7 +3279,7 @@
* @param dir_ptr the prediction direction will be stored here
* @return the quantized dc
*/
@@ -20,7 +18,7 @@
{
int level, code;
-@@ -4593,7 +4593,7 @@
+@@ -3629,7 +3629,7 @@
* decodes a block.
* @return <0 if an error occured
*/
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
index 3e3bb25c1eb4..5dd6cce9fc91 100644
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
+++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
@@ -1,31 +1,6 @@
---- src/libffmpeg/libavcodec/mpeg12.c.orig Wed Aug 4 17:16:09 2004
-+++ src/libffmpeg/libavcodec/mpeg12.c Wed Aug 4 17:19:51 2004
-@@ -65,16 +65,16 @@
- 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,
-- DCTELEM *block,
-- int n);
--static inline int mpeg1_decode_block_intra(MpegEncContext *s,
-- DCTELEM *block,
-- int n);
--static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
-+static int mpeg1_decode_block_inter(MpegEncContext *s,
-+ DCTELEM *block,
-+ int n);
-+static int mpeg1_decode_block_intra(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 int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
-@@ -1463,9 +1463,9 @@
+--- src/libffmpeg/libavcodec/mpeg12.c.orig Sun Sep 12 21:17:14 2004
++++ src/libffmpeg/libavcodec/mpeg12.c Mon Nov 15 01:06:46 2004
+@@ -1044,9 +1044,9 @@
return diff;
}
@@ -38,7 +13,7 @@
{
int level, dc, diff, i, j, run;
int component;
-@@ -1536,9 +1536,9 @@
+@@ -1117,9 +1117,9 @@
return 0;
}
@@ -51,7 +26,7 @@
{
int level, i, j, run;
RLTable *rl = &rl_mpeg1;
-@@ -1614,9 +1614,9 @@
+@@ -1195,9 +1195,9 @@
/* Also does unquantization here, since I will never support mpeg2
encoding */
@@ -64,7 +39,7 @@
{
int level, i, j, run;
RLTable *rl = &rl_mpeg1;
-@@ -1693,9 +1693,9 @@
+@@ -1274,9 +1274,9 @@
return 0;
}
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c
deleted file mode 100644
index e801a9af4694..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/libffmpeg/libavcodec/mpegvideo.c.orig Sun May 30 21:24:21 2004
-+++ src/libffmpeg/libavcodec/mpegvideo.c Sat Sep 11 23:30:05 2004
-@@ -3926,6 +3926,8 @@
- +sse(s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize);
- }
-
-+/* xine: do not need this for decode or MPEG-1 encoding modes */
-+#if 0
- static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){
- MpegEncContext *s= arg;
-
-@@ -3969,6 +3971,7 @@
- }
- return 0;
- }
-+#endif
-
- static int mb_var_thread(AVCodecContext *c, void *arg){
- MpegEncContext *s= arg;
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
index 8125185cb8f4..4391fc9c730e 100644
--- a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
+++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
@@ -1,19 +1,17 @@
---- src/libffmpeg/libavcodec/msmpeg4.c.orig Wed Aug 4 17:27:04 2004
-+++ src/libffmpeg/libavcodec/msmpeg4.c Wed Aug 4 17:27:37 2004
-@@ -60,8 +60,8 @@
- 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,
-- int n, int coded, const uint8_t *scantable);
-+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,
+--- src/libffmpeg/libavcodec/msmpeg4.c.orig Sun Sep 12 21:17:14 2004
++++ src/libffmpeg/libavcodec/msmpeg4.c Mon Nov 15 01:10:50 2004
+@@ -64,7 +64,7 @@
int *mx_ptr, int *my_ptr);
-@@ -1656,8 +1656,8 @@
- return 0;
+ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val);
+ static void init_h263_dc_for_msmpeg4(void);
+-static inline void msmpeg4_memsetw(short *tab, int val, int n);
++static void msmpeg4_memsetw(short *tab, int val, int n);
+ #ifdef CONFIG_ENCODERS
+ static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run, int level, int intra);
+ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr);
+@@ -1478,8 +1478,8 @@
}
+
//#define ERROR_DETAILS
-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded, const uint8_t *scan_table)
diff --git a/multimedia/libxine/files/patch-src:libmad:Makefile.in b/multimedia/libxine/files/patch-src:libmad:Makefile.in
index 004e0a43dcb0..6218c4807411 100644
--- a/multimedia/libxine/files/patch-src:libmad:Makefile.in
+++ b/multimedia/libxine/files/patch-src:libmad:Makefile.in
@@ -1,9 +1,20 @@
---- src/libmad/Makefile.in.orig Sun May 16 11:32:08 2004
-+++ src/libmad/Makefile.in Sun May 16 11:32:44 2004
-@@ -403,42 +403,12 @@
-
+--- src/libmad/Makefile.in.orig Thu Dec 30 00:47:20 2004
++++ src/libmad/Makefile.in Thu Dec 30 00:53:06 2004
+@@ -75,9 +75,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 = $(top_builddir)/src/xine-engine/libxine.la
+ xineplug_decode_mad_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_xineplug_decode_mad_la_OBJECTS = bit.lo fixed.lo frame.lo \
+- huffman.lo layer12.lo layer3.lo stream.lo synth.lo timer.lo \
+- version.lo xine_decoder.lo
++am_xineplug_decode_mad_la_OBJECTS = xine_decoder.lo
+ xineplug_decode_mad_la_OBJECTS = $(am_xineplug_decode_mad_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -512,20 +510,9 @@
+ AM_CFLAGS = -DOPT_SPEED
+ EXTRA_DIST = imdct_l_arm.S
lib_LTLIBRARIES = xineplug_decode_mad.la
-
-xineplug_decode_mad_la_SOURCES = \
- bit.c \
- fixed.c \
@@ -18,30 +29,25 @@
- xine_decoder.c
+xineplug_decode_mad_la_SOURCES = xine_decoder.c
-
-xineplug_decode_mad_la_LIBADD = $(XINE_LIB)
+xineplug_decode_mad_la_LIBADD = $(XINE_LIB) -lmad
xineplug_decode_mad_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+ noinst_HEADERS = \
+ D.dat \
+@@ -614,16 +601,6 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffman.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer12.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer3.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xine_decoder.Plo@am__quote@
--noinst_HEADERS = \
-- D.dat \
-- imdct_s.dat \
-- qc_table.dat \
-- rq_table.dat \
-- sf_table.dat \
-- bit.h \
-- fixed.h \
-- frame.h \
-- global.h \
-- huffman.h \
-- layer12.h \
-- layer3.h \
-- stream.h \
-- synth.h \
-- timer.h \
-- version.h
--
--subdir = src/libmad
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
+ .c.o:
diff --git a/multimedia/libxine/files/patch-src:libreal:audio_decoder.c b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
new file mode 100644
index 000000000000..ae36d5b7838a
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libreal:audio_decoder.c
@@ -0,0 +1,46 @@
+--- src/libreal/audio_decoder.c.orig Thu Dec 16 22:59:10 2004
++++ src/libreal/audio_decoder.c Thu Dec 30 08:55:14 2004
+@@ -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,22 +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/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 --git a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
index 47ff6e57de68..83330e62a7b8 100644
--- a/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:libreal:xine_decoder.c
@@ -1,33 +1,46 @@
---- src/libreal/xine_decoder.c.orig Mon Dec 15 07:13:24 2003
-+++ src/libreal/xine_decoder.c Mon Jan 12 00:04:26 2004
-@@ -589,24 +589,15 @@
+--- src/libreal/xine_decoder.c.orig Thu Dec 16 22:59:10 2004
++++ src/libreal/xine_decoder.c Thu Dec 30 08:56:38 2004
+@@ -47,6 +47,14 @@
+ #include "buffer.h"
+ #include "xineutils.h"
- /* try some auto-detection */
++#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;
-- if (!stat ("/usr/local/RealPlayer8/Codecs/drv3.so.6.0", &s))
-+ if (!stat ("/usr/local/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
- config->update_string (config, "codec.real_codecs_path",
-- "/usr/local/RealPlayer8/Codecs");
-- if (!stat ("/usr/RealPlayer8/Codecs/drv3.so.6.0", &s))
-+ "/usr/local/lib/RealPlayer8/Codecs");
-+ if (!stat ("/usr/local/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
- config->update_string (config, "codec.real_codecs_path",
-- "/usr/RealPlayer8/Codecs");
-- if (!stat ("/usr/lib/RealPlayer8/Codecs/drv3.so.6.0", &s))
-+ "/usr/local/lib/RealPlayer9/users/Real/Codecs");
-+ if (!stat ("/usr/local/lib/win32/drv3.so.6.0", &s))
- config->update_string (config, "codec.real_codecs_path",
-- "/usr/lib/RealPlayer8/Codecs");
-- if (!stat ("/opt/RealPlayer8/Codecs/drv3.so.6.0", &s))
-- config->update_string (config, "codec.real_codecs_path",
-- "/opt/RealPlayer8/Codecs");
-- if (!stat ("/usr/lib/RealPlayer9/users/Real/Codecs/drv3.so.6.0", &s))
-- config->update_string (config, "codec.real_codecs_path",
-- "/usr/lib/RealPlayer9/users/Real/Codecs");
-- if (!stat ("/usr/lib/win32/drv3.so.6.0", &s))
-- config->update_string (config, "codec.real_codecs_path",
-- "/usr/lib/win32");
-+ "/usr/local/lib/win32");
- }
+@@ -589,22 +597,12 @@
- lprintf ("real codec path : %s\n", real_codec_path);
+ /* 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/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 --git a/multimedia/libxine/files/patch-src:post:goom:zoom_filter_xmmx.c b/multimedia/libxine/files/patch-src:post:goom:zoom_filter_xmmx.c
deleted file mode 100644
index e41c57e446f1..000000000000
--- a/multimedia/libxine/files/patch-src:post:goom:zoom_filter_xmmx.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/post/goom/zoom_filter_xmmx.c.orig Sun May 9 22:41:34 2004
-+++ src/post/goom/zoom_filter_xmmx.c Sun May 9 22:51:42 2004
-@@ -124,7 +124,7 @@
- "andl $15,%%eax\n"
-
- "movd (%%ebx,%%eax,4),%%mm3\n"
-- ::"X"(precalCoef):"eax","ebx");
-+ ::"g"(precalCoef):"eax","ebx");
-
- /*
- * extraction des coefficients...
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 65912e28562e..0f4f638a0c9e 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -12,9 +12,11 @@ include/xine/info_helper.h
include/xine/input_plugin.h
include/xine/io_helper.h
include/xine/metronom.h
+include/xine/os_types.h
include/xine/osd.h
include/xine/plugin_catalog.h
include/xine/post.h
+include/xine/refcounter.h
include/xine/resample.h
include/xine/scratch.h
include/xine/spu_decoder.h
@@ -30,8 +32,8 @@ include/xine/xineutils.h
include/xine/xmllexer.h
include/xine/xmlparser.h
lib/libxine.so
-lib/libxine.so.9
-lib/xine/plugins/1.0.0/post/xineplug_post_audio_filter_upmix.so
+lib/libxine.so.12
+lib/xine/plugins/1.0.0/post/xineplug_post_audio_filters.so
lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.so
lib/xine/plugins/1.0.0/post/xineplug_post_planar.so
@@ -71,6 +73,8 @@ lib/xine/plugins/1.0.0/xineplug_decode_rgb.so
lib/xine/plugins/1.0.0/xineplug_decode_speex.so
lib/xine/plugins/1.0.0/xineplug_decode_spu.so
lib/xine/plugins/1.0.0/xineplug_decode_spucc.so
+lib/xine/plugins/1.0.0/xineplug_decode_spucmml.so
+lib/xine/plugins/1.0.0/xineplug_decode_spudvb.so
lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
%%WITH_LIBTHEORA%%lib/xine/plugins/1.0.0/xineplug_decode_theora.so
%%WITH_LIBCACA%%lib/xine/plugins/1.0.0/xineplug_vo_out_caca.so
@@ -114,11 +118,13 @@ lib/xine/plugins/1.0.0/xineplug_inp_net.so
lib/xine/plugins/1.0.0/xineplug_inp_pnm.so
lib/xine/plugins/1.0.0/xineplug_inp_rtp.so
lib/xine/plugins/1.0.0/xineplug_inp_rtsp.so
+%%WITH_SMB%%lib/xine/plugins/1.0.0/xineplug_inp_smb.so
lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.so
lib/xine/plugins/1.0.0/xineplug_inp_vcd.so
lib/xine/plugins/1.0.0/xineplug_inp_vcdo.so
lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so
lib/xine/plugins/1.0.0/xineplug_vo_out_none.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_opengl.so
lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
%%WITH_VIDIX%%lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.so
lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
@@ -135,6 +141,7 @@ share/aclocal/xine.m4
%%DOCSDIR%%/README.opengl
%%DOCSDIR%%/README.solaris
%%DOCSDIR%%/README.syncfb
+%%DOCSDIR%%/README_xxmc.html
%%DOCSDIR%%/faq/faq.html
%%DOCSDIR%%/faq/faq.txt
%%DOCSDIR%%/hackersguide/architecture.png