summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/xine-lib/Makefile3
-rw-r--r--multimedia/xine-lib/Makefile.common6
-rw-r--r--multimedia/xine-lib/PLIST.common3
-rw-r--r--multimedia/xine-lib/PLIST.common_end4
-rw-r--r--multimedia/xine-lib/distinfo19
-rw-r--r--multimedia/xine-lib/patches/patch-ak26
-rw-r--r--multimedia/xine-lib/patches/patch-al20
-rw-r--r--multimedia/xine-lib/patches/patch-an76
-rw-r--r--multimedia/xine-lib/patches/patch-ao24
-rw-r--r--multimedia/xine-lib/patches/patch-aq21
-rw-r--r--multimedia/xine-lib/patches/patch-ba8
-rw-r--r--multimedia/xine-lib/patches/patch-be12
-rw-r--r--multimedia/xine-lib/patches/patch-ca19
13 files changed, 37 insertions, 204 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 7f83d433df3..bf675bd87b2 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2005/05/26 22:47:22 reed Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/29 16:09:11 drochner Exp $
.include "Makefile.common"
-PKGREVISION= 2
COMMENT= Multimedia player library
BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 5b3c105bbd7..403595e6276 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.23 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/07/29 16:09:11 drochner Exp $
#
-DISTNAME= xine-lib-1.0.1
-XINE_PKGNAME= xine-lib-1.0.1
+DISTNAME= xine-lib-1.0.2
+XINE_PKGNAME= xine-lib-1.0.2
PKGNAME?= ${XINE_PKGNAME}
CATEGORIES?= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index 79244898a69..0e3de54dc85 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.11 2005/05/18 21:43:21 markd Exp $
+@comment $NetBSD: PLIST.common,v 1.12 2005/07/29 16:09:11 drochner Exp $
bin/xine-config
include/xine.h
include/xine/attributes.h
@@ -191,6 +191,7 @@ lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xshm.so
${HAVE_XV}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xv.a
${HAVE_XV}lib/xine/plugins/${PKGVERSION}/xineplug_vo_out_xv.so
man/man1/xine-config.1
+man/man5/xine.5
share/aclocal/xine.m4
share/doc/xine/README
share/doc/xine/README.MINGWCROSS
diff --git a/multimedia/xine-lib/PLIST.common_end b/multimedia/xine-lib/PLIST.common_end
index 21511cbdbc0..4cbfef754fa 100644
--- a/multimedia/xine-lib/PLIST.common_end
+++ b/multimedia/xine-lib/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.3 2005/05/10 00:16:42 reed Exp $
+@comment $NetBSD: PLIST.common_end,v 1.4 2005/07/29 16:09:11 drochner Exp $
@dirrm share/xine/libxine1/fonts
@dirrm share/xine/libxine1
@dirrm share/xine
@@ -8,7 +8,7 @@
@exec ${MKDIR} %D/lib/xine/plugins/${PKGVERSION}/vidix
@dirrm lib/xine/plugins/${PKGVERSION}/vidix
@dirrm lib/xine/plugins/${PKGVERSION}/post
-@dirrm lib/xine/plugins/1.0.1
+@dirrm lib/xine/plugins/${PKGVERSION}
@dirrm lib/xine/plugins
@dirrm lib/xine
@dirrm include/xine
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 8634a45a652..822fe866cf9 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2005/05/26 22:47:22 reed Exp $
+$NetBSD: distinfo,v 1.20 2005/07/29 16:09:11 drochner Exp $
-SHA1 (xine-lib-1.0.1.tar.gz) = 9973c4674a433baccd81988df0746d9e2d111df8
-RMD160 (xine-lib-1.0.1.tar.gz) = 1e4de9b222a914b516d6cfa08695a9ccad3f3db8
-Size (xine-lib-1.0.1.tar.gz) = 7774954 bytes
+SHA1 (xine-lib-1.0.2.tar.gz) = fb2018b3c9405bab91c6530f60c954d4ce7ba9fe
+RMD160 (xine-lib-1.0.2.tar.gz) = 28c1d12ddde1699d1fb47453c3af5e2ffa07b9bb
+Size (xine-lib-1.0.2.tar.gz) = 7774805 bytes
SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519
SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a
SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
@@ -13,21 +13,16 @@ SHA1 (patch-ag) = 536e98365a149624083b23cc65af8d4c2320b8d8
SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
SHA1 (patch-aj) = a213d316b5e3e486fe4c7c474a449408972db6f0
-SHA1 (patch-ak) = 75354613440b00aea76fabf1f6cc68808cf6c988
-SHA1 (patch-al) = 71e416030e14bde560b6fb58f5bfa5d1493bce62
SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
-SHA1 (patch-an) = e7e507e59417301e55e62c71b3a0039c32a8b7c7
-SHA1 (patch-ao) = 425257d43fb0f2c42590401ad17d829b03a28773
+SHA1 (patch-ao) = 04daec3b16d1a841235dfa9745b002bd8a3bc6a4
SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
-SHA1 (patch-aq) = 18d1f40634e76e0d05c1dd431142618fe98cf7ce
SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e
SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
-SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b
+SHA1 (patch-ba) = c4a5fbe9d88d21a90fe01359ace7831f2a865c86
SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
-SHA1 (patch-be) = 8e755cd956c6c1987e57497f25354de7796345e0
+SHA1 (patch-be) = 237e30de8362daff4fb2e6689a9b41f3260baa73
SHA1 (patch-bg) = c905cbac881a8f623bb0f465194673dcdaf373c0
-SHA1 (patch-ca) = 07696bef0623fcef8dcffe70ba81587f2f147343
SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2
diff --git a/multimedia/xine-lib/patches/patch-ak b/multimedia/xine-lib/patches/patch-ak
deleted file mode 100644
index 7b1c4c9ed83..00000000000
--- a/multimedia/xine-lib/patches/patch-ak
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2005/05/26 22:47:22 reed Exp $
-Support --enable-fpic with recent versions of gcc.
-From xine cvs.
-
---- src/post/goom/mmx.h.orig Sat May 7 18:00:46 2005
-+++ src/post/goom/mmx.h Sat May 7 18:01:45 2005
-@@ -72,6 +72,7 @@
- register int rval = 0;
-
- __asm__ __volatile__ (
-+ "push %%ebx\n\t"
- /* See if CPUID instruction is supported ... */
- /* ... Get copies of EFLAGS into eax and ecx */
- "pushf\n\t"
-@@ -214,9 +215,10 @@
- "movl $0, %0\n\n\t"
-
- "Return:\n\t"
-+ "pop %%ebx\n\t"
- : "=X" (rval)
- : /* no input */
-- : "eax", "ebx", "ecx", "edx"
-+ : "eax", "ecx", "edx"
- );
-
- /* Return */
diff --git a/multimedia/xine-lib/patches/patch-al b/multimedia/xine-lib/patches/patch-al
deleted file mode 100644
index f68053ee319..00000000000
--- a/multimedia/xine-lib/patches/patch-al
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-al,v 1.3 2005/05/26 22:47:22 reed Exp $
-Bug fix from CVS: Clip goom fps value to >= 1 [xine bug #1193783]
-
---- src/post/goom/xine_goom.c.orig Sat May 7 18:03:44 2005
-+++ src/post/goom/xine_goom.c Sat May 7 18:04:41 2005
-@@ -145,9 +145,13 @@
-
- if(class->ip) {
- post_plugin_goom_t *this = class->ip;
-+
-+ if (cfg->num_value < 1)
-+ cfg->num_value = 1;
-+
- this->fps = cfg->num_value;
-
-- if(this->sample_rate && this->fps)
-+ if(this->sample_rate)
- this->samples_per_frame = this->sample_rate / this->fps;
- }
- }
diff --git a/multimedia/xine-lib/patches/patch-an b/multimedia/xine-lib/patches/patch-an
deleted file mode 100644
index 3185089dc13..00000000000
--- a/multimedia/xine-lib/patches/patch-an
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-an,v 1.3 2005/05/26 22:47:22 reed Exp $
-Support --enable-fpic with recent versions of gcc.
-From xine cvs.
-
---- src/post/goom/xmmx.c.orig Sat May 7 18:06:07 2005
-+++ src/post/goom/xmmx.c Sat May 7 18:06:59 2005
-@@ -112,23 +112,23 @@
- * post : mm3 & mm4 : coefs for this position
- * mm1 : X vector [0|X]
- *
-- * modif : eax,ebx
-+ * modif : eax,ecx
- */
- __asm__ __volatile__ (
-- "movd %%mm0,%%ebx\n"
-+ "movd %%mm0,%%ecx\n"
- "movq %%mm0,%%mm1\n"
-
-- "andl $15,%%ebx\n"
-+ "andl $15,%%ecx\n"
- "psrlq $32,%%mm1\n"
-
-- "shll $6,%%ebx\n"
-+ "shll $6,%%ecx\n"
- "movd %%mm1,%%eax\n"
-
-- "addl %0,%%ebx\n"
-+ "addl %0,%%ecx\n"
- "andl $15,%%eax\n"
-
-- "movd (%%ebx,%%eax,4),%%mm3\n"
-- ::"g"(precalCoef):"eax","ebx");
-+ "movd (%%ecx,%%eax,4),%%mm3\n"
-+ ::"g"(precalCoef):"eax","ecx");
-
- /*
- * extraction des coefficients...
-@@ -158,7 +158,7 @@
- * post : mm0 : expix1[position]
- * mm2 : expix1[position+largeur]
- *
-- * modif : eax,ebx
-+ * modif : eax,ecx
- */
- psrld_i2r (PERTEDEC,mm0);
- psrld_i2r (PERTEDEC,mm1);
-@@ -167,23 +167,23 @@
- /*^*/ "movq %%mm3,%%mm5\n" /*^*/
-
- "mull %1\n"
-- "movd %%mm0,%%ebx\n"
-+ "movd %%mm0,%%ecx\n"
- /*^*/ "punpcklbw %%mm5, %%mm3\n" /*^*/
-
-- "addl %%ebx,%%eax\n"
-+ "addl %%ecx,%%eax\n"
- /*^*/ "movq %%mm3,%%mm4\n" /*^*/
- /*^*/ "movq %%mm3,%%mm5\n" /*^*/
-
-- "movl %0,%%ebx\n"
-+ "movl %0,%%ecx\n"
- /*^*/ "punpcklbw %%mm5,%%mm3\n" /*^*/
-
-- "movq (%%ebx,%%eax,4),%%mm0\n"
-+ "movq (%%ecx,%%eax,4),%%mm0\n"
- /*^*/ "punpckhbw %%mm5,%%mm4\n" /*^*/
-
- "addl %1,%%eax\n"
-- "movq (%%ebx,%%eax,4),%%mm2\n"
-+ "movq (%%ecx,%%eax,4),%%mm2\n"
-
-- : : "X"(expix1), "X"(prevX):"eax","ebx"
-+ : : "X"(expix1), "X"(prevX):"eax","ecx"
- );
-
- /*
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index 620994d6a49..bcced17ba61 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,8 +1,17 @@
-$NetBSD: patch-ao,v 1.7 2005/05/02 11:29:35 drochner Exp $
+$NetBSD: patch-ao,v 1.8 2005/07/29 16:09:11 drochner Exp $
---- src/libw32dll/wine/Makefile.in.orig 2005-04-26 10:16:53.000000000 +0200
+--- src/libw32dll/wine/Makefile.in.orig 2005-07-26 20:33:21.000000000 +0200
+++ src/libw32dll/wine/Makefile.in
-@@ -364,6 +364,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
+@@ -65,7 +65,7 @@ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libwine_la_LIBADD =
++libwine_la_LIBADD = ${WINE_LIBS}
+ am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo \
+ ldt_keeper.lo module.lo pe_image.lo pe_resource.lo resource.lo \
+ registry.lo vfl.lo win32.lo stubs.lo wrapper.lo
+@@ -423,6 +423,7 @@ VORBIS_LIBS = @VORBIS_LIBS@
W32DLL_DEP = @W32DLL_DEP@
W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
@@ -10,12 +19,3 @@ $NetBSD: patch-ao,v 1.7 2005/05/02 11:29:35 drochner Exp $
WIN32_FALSE = @WIN32_FALSE@
WIN32_TRUE = @WIN32_TRUE@
XGETTEXT = @XGETTEXT@
-@@ -527,7 +528,7 @@ CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
-
- libwine_la_LDFLAGS =
--libwine_la_LIBADD =
-+libwine_la_LIBADD = ${WINE_LIBS}
- am_libwine_la_OBJECTS = afl.lo driver.lo elfdll.lo ext.lo ldt_keeper.lo \
- module.lo pe_image.lo pe_resource.lo resource.lo registry.lo \
- vfl.lo win32.lo stubs.lo wrapper.lo
diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq
deleted file mode 100644
index 783f5b8079e..00000000000
--- a/multimedia/xine-lib/patches/patch-aq
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2005/05/02 11:29:35 drochner Exp $
-
---- src/dxr3/Makefile.in.orig 2005-04-26 10:15:28.000000000 +0200
-+++ src/dxr3/Makefile.in
-@@ -457,6 +457,7 @@ AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS
- @HAVE_X11_TRUE@link_x_libs = $(X_LIBS) -lXext
- @HAVE_LIBFAME_TRUE@link_fame = $(LIBFAME_LIBS)
- @HAVE_LIBRTE_TRUE@link_rte = -lrte
-+@HAVE_XINERAMA_TRUE@link_xinerama = -lXinerama
-
- lib_LTLIBRARIES = $(dxr3_modules)
-
-@@ -480,7 +481,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \
- video_out_dxr3.c
-
-
--xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB)
-+xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB)
- xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
-
- noinst_HEADERS = \
diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba
index 27165233d09..22c8777247e 100644
--- a/multimedia/xine-lib/patches/patch-ba
+++ b/multimedia/xine-lib/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2004/10/27 20:31:33 drochner Exp $
+$NetBSD: patch-ba,v 1.3 2005/07/29 16:09:11 drochner Exp $
---- src/input/vcd/xineplug_inp_vcd.c.orig 2004-07-27 04:08:48.000000000 +0200
+--- src/input/vcd/xineplug_inp_vcd.c.orig 2005-07-17 23:50:00.000000000 +0200
+++ src/input/vcd/xineplug_inp_vcd.c
-@@ -923,7 +923,7 @@ vcd_class_get_description (input_class_t
+@@ -999,7 +999,7 @@ vcd_class_get_description (input_class_t
static const char *
vcd_class_get_identifier (input_class_t *this_gen) {
dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
@@ -10,4 +10,4 @@ $NetBSD: patch-ba,v 1.2 2004/10/27 20:31:33 drochner Exp $
+ return strdup(SHORT_PLUGIN_NAME);
}
- /*
+ /* HACK until we put modify and put in vcdplayer. */
diff --git a/multimedia/xine-lib/patches/patch-be b/multimedia/xine-lib/patches/patch-be
index 7da007fce6c..2892ae2fa2d 100644
--- a/multimedia/xine-lib/patches/patch-be
+++ b/multimedia/xine-lib/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.3 2005/05/02 11:29:35 drochner Exp $
+$NetBSD: patch-be,v 1.4 2005/07/29 16:09:11 drochner Exp $
---- src/audio_out/Makefile.in.orig 2005-04-26 10:15:23.000000000 +0200
+--- src/audio_out/Makefile.in.orig 2005-07-26 20:32:23.000000000 +0200
+++ src/audio_out/Makefile.in
-@@ -306,6 +306,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
+@@ -449,6 +449,7 @@ OGG_CFLAGS = @OGG_CFLAGS@
OGG_LIBS = @OGG_LIBS@
OPENGL_CFLAGS = @OPENGL_CFLAGS@
OPENGL_LIBS = @OPENGL_LIBS@
@@ -10,12 +10,12 @@ $NetBSD: patch-be,v 1.3 2005/05/02 11:29:35 drochner Exp $
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
-@@ -509,7 +510,7 @@ xineplug_ao_out_file_la_LIBADD = $(XINE_
+@@ -640,7 +641,7 @@ xineplug_ao_out_file_la_SOURCES = audio_
+ xineplug_ao_out_file_la_LIBADD = $(XINE_LIB)
xineplug_ao_out_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-
xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c
-xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB)
+xineplug_ao_out_oss_la_LIBADD = $(XINE_LIB) $(OSS_LIBS)
xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
-
xineplug_ao_out_alsa_la_SOURCES = audio_alsa_out.c
+ xineplug_ao_out_alsa_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB)
diff --git a/multimedia/xine-lib/patches/patch-ca b/multimedia/xine-lib/patches/patch-ca
deleted file mode 100644
index d0896b013ff..00000000000
--- a/multimedia/xine-lib/patches/patch-ca
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2005/05/02 11:29:35 drochner Exp $
-
---- aclocal.m4.orig 2005-04-30 22:09:14.000000000 +0200
-+++ aclocal.m4
-@@ -7869,14 +7869,6 @@ if test x"$external_ffmpeg" != "xno"; th
- CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
- LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
-
-- dnl drop the cache
-- for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \
-- "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; }
-- done
--
- dnl look for headers
- AC_CHECK_HEADER(avcodec.h, , continue)
- AC_CHECK_HEADER(postprocess.h, , continue)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 01:04:14 +0000