summaryrefslogtreecommitdiff
path: root/multimedia/xine-lib/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/xine-lib/patches')
-rw-r--r--multimedia/xine-lib/patches/patch-ag55
-rw-r--r--multimedia/xine-lib/patches/patch-ao14
-rw-r--r--multimedia/xine-lib/patches/patch-ap8
-rw-r--r--multimedia/xine-lib/patches/patch-da14
-rw-r--r--multimedia/xine-lib/patches/patch-ea30
-rw-r--r--multimedia/xine-lib/patches/patch-ec17
-rw-r--r--multimedia/xine-lib/patches/patch-ed15
-rw-r--r--multimedia/xine-lib/patches/patch-ee22
8 files changed, 67 insertions, 108 deletions
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 122c2500a00..6956457c1b9 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-ag,v 1.15 2007/02/07 20:04:00 drochner Exp $
---- configure.ac.orig 2006-11-05 15:16:56.000000000 +0000
+--- configure.ac.orig 2007-01-28 18:17:56.000000000 +0100
+++ configure.ac
-@@ -221,7 +221,7 @@ AC_ARG_WITH(pthread-prefix,
+@@ -220,7 +220,7 @@ AC_ARG_WITH(pthread-prefix,
[pthread_prefix="no"])
case "$host" in
- *-*-freebsd*)
+ *-*-freebsd* | *-*-dragonfly*)
- if test x"$pthread_prefix" = "xno"; then
+ if test "x$pthread_prefix" = "xno"; then
pthread_prefix="/usr/local"
fi
-@@ -508,6 +508,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
+@@ -584,6 +584,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
AC_SUBST(NET_LIBS)
@@ -21,34 +21,34 @@ $NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $
dnl ---------------------------------------------
dnl socklen_t
-@@ -698,7 +701,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
+@@ -774,7 +777,7 @@ XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
AC_MSG_RESULT()
dnl Check if vld "extended" XvMC is available
--if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then
-+if test x$xxmc_stub = "xXvMCW" && test x$ac_have_xv = "xyes"; then
+-if test "x$xxmc_stub" == "xXvMCW" && test "x$ac_have_xv" == "xyes"; then
++if test "x$xxmc_stub" = "xXvMCW" && test "x$ac_have_xv" = "xyes"; then
AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
ac_have_xxmc="yes",
[ac_have_xxmc="no"
-@@ -728,7 +731,7 @@ if test x$ac_have_xxmc = "xyes"; then
+@@ -804,7 +807,7 @@ if test "x$ac_have_xxmc" = "xyes"; then
fi
dnl Try fallback to standard XvMC if vld failed
- if test x$ac_have_xxmc = "xno"; then
-- if test x$xxmc_stub == "xXvMCW"; then
-+ if test x$xxmc_stub = "xXvMCW"; then
+ if test "x$ac_have_xxmc" = "xno"; then
+- if test "x$xxmc_stub" == "xXvMCW"; then
++ if test "x$xxmc_stub" = "xXvMCW"; then
AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
ac_have_xxmc="yes",
[ac_have_xxmc="no"
-@@ -782,7 +785,7 @@ saved_libs="$LIBS"
+@@ -858,7 +861,7 @@ saved_libs="$LIBS"
XVMC_LIBS="-L$xvmc_path -l$xvmc_stub"
AC_MSG_CHECKING(whether to enable the xvmc plugin)
AC_MSG_RESULT()
--if test x$xvmc_stub == "xXvMCW"; then
-+if test x$xvmc_stub = "xXvMCW"; then
+-if test "x$xvmc_stub" == "xXvMCW"; then
++if test "x$xvmc_stub" = "xXvMCW"; then
AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
ac_have_xvmc="yes",
[ac_have_xvmc="no"
-@@ -833,7 +836,6 @@ if test "x$enable_xinerama" != "xno"; th
+@@ -909,7 +912,6 @@ if test "x$enable_xinerama" != "xno"; th
])
if test "x$ac_have_xinerama" = "xyes"; then
AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
@@ -56,7 +56,7 @@ $NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $
fi
else
ac_have_xinerama=no
-@@ -1325,10 +1327,21 @@ AC_ARG_ENABLE([oss],
+@@ -1422,10 +1424,21 @@ AC_ARG_ENABLE([oss],
[with_oss=$enableval], [with_oss=yes])
if test "x$with_oss" = "xyes"; then
@@ -78,30 +78,29 @@ $NetBSD: patch-ag,v 1.14 2006/12/08 09:24:26 abs Exp $
#include <soundcard.h>
#else
#include <sys/soundcard.h>
-@@ -1343,7 +1356,7 @@ else
+@@ -1440,6 +1453,7 @@ else
have_ossaudio=no
fi
- AM_CONDITIONAL(HAVE_OSS, test x"$have_ossaudio" = "xyes")
--
+ AM_CONDITIONAL(HAVE_OSS, test "x$have_ossaudio" = "xyes")
+AC_SUBST(OSS_LIBS)
+
dnl ---------------------------------------------
- dnl Alsa support
-@@ -1468,9 +1481,10 @@ AC_ARG_ENABLE([gnomevfs],
+@@ -1565,9 +1579,10 @@ AC_ARG_ENABLE([gnomevfs],
[with_gnome_vfs=$enableval], [with_gnome_vfs=yes])
if test "x$with_gnome_vfs" = "xyes"; then
- PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
- no_gnome_vfs=no,
- no_gnome_vfs=yes)
-+ dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
-+ dnl no_gnome_vfs=no,
-+ dnl no_gnome_vfs=yes)
-+ no_gnome_vfs=yes
++dnl PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0,
++dnl no_gnome_vfs=no,
++dnl no_gnome_vfs=yes)
++no_gnome_vfs=yes
AC_SUBST(GNOME_VFS_CFLAGS)
AC_SUBST(GNOME_VFS_LIBS)
- if test x"$no_gnome_vfs" != "xyes"; then
-@@ -1816,7 +1830,7 @@ int has_timeout=sizeof(test.timeout);],
+ if test "x$no_gnome_vfs" != "xyes"; then
+@@ -1913,7 +1928,7 @@ int has_timeout=sizeof(test.timeout);],
AC_DEFINE([HAVE_WIN32_CDROM], [1],
[Define 1 if you have MinGW CD-ROM support])
;;
diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao
index 846a053ea3f..4b9883b8c9e 100644
--- a/multimedia/xine-lib/patches/patch-ao
+++ b/multimedia/xine-lib/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.11 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-ao,v 1.12 2007/02/07 20:04:00 drochner Exp $
---- src/libw32dll/wine/Makefile.in.orig 2006-12-03 19:41:07.000000000 +0000
+--- src/libw32dll/wine/Makefile.in.orig 2007-01-28 23:57:46.000000000 +0100
+++ src/libw32dll/wine/Makefile.in
-@@ -62,7 +62,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -60,7 +60,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -11,11 +11,11 @@ $NetBSD: patch-ao,v 1.11 2006/12/08 09:24:26 abs Exp $
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
-@@ -422,6 +422,7 @@ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@
- WAND_CFLAGS = @WAND_CFLAGS@
- WAND_LIBS = @WAND_LIBS@
+@@ -431,6 +431,7 @@ WAND_LIBS = @WAND_LIBS@
+ WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+ WAVPACK_LIBS = @WAVPACK_LIBS@
WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
+WINE_LIBS = @WINE_LIBS@
WIN32_FALSE = @WIN32_FALSE@
WIN32_TRUE = @WIN32_TRUE@
- X11_CFLAGS = @X11_CFLAGS@
+ XGETTEXT = @XGETTEXT@
diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap
index 4ef2192eec7..29a09d38407 100644
--- a/multimedia/xine-lib/patches/patch-ap
+++ b/multimedia/xine-lib/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.3 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-ap,v 1.4 2007/02/07 20:04:00 drochner Exp $
---- src/dxr3/Makefile.am.orig 2006-07-10 23:08:13.000000000 +0100
+--- src/dxr3/Makefile.am.orig 2006-12-30 20:54:32.000000000 +0100
+++ src/dxr3/Makefile.am
@@ -18,6 +18,9 @@ endif
if HAVE_LIBRTE
@@ -16,8 +16,8 @@ $NetBSD: patch-ap,v 1.3 2006/12/08 09:24:26 abs Exp $
dxr3_scr.c \
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_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm
++xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(XINE_LIB) $(DYNAMIC_LD_LIBS) -lm
xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module
diff --git a/multimedia/xine-lib/patches/patch-da b/multimedia/xine-lib/patches/patch-da
index c414923103c..b73ce23ac91 100644
--- a/multimedia/xine-lib/patches/patch-da
+++ b/multimedia/xine-lib/patches/patch-da
@@ -1,11 +1,11 @@
-$NetBSD: patch-da,v 1.2 2006/12/08 09:24:26 abs Exp $
+$NetBSD: patch-da,v 1.3 2007/02/07 20:04:00 drochner Exp $
Move some inlined functions to a place before they are used,
otherwise GCC barfs when -fno-unit-a-time is active.
---- src/libffmpeg/libavcodec/h263.c.orig 2006-08-02 08:02:39.000000000 +0100
+--- src/libffmpeg/libavcodec/h263.c.orig 2007-01-28 19:38:33.000000000 +0100
+++ src/libffmpeg/libavcodec/h263.c
-@@ -3432,6 +3432,53 @@ static inline int get_amv(MpegEncContext
+@@ -3459,6 +3459,53 @@ static inline int get_amv(MpegEncContext
}
/**
@@ -59,7 +59,7 @@ otherwise GCC barfs when -fno-unit-a-time is active.
* decodes first partition.
* @return number of MBs decoded or <0 if an error occured
*/
-@@ -3737,124 +3784,380 @@ int ff_mpeg4_decode_partitions(MpegEncCo
+@@ -3764,124 +3811,380 @@ int ff_mpeg4_decode_partitions(MpegEncCo
}
/**
@@ -314,7 +314,7 @@ otherwise GCC barfs when -fno-unit-a-time is active.
+
+#if 0
+ if(s->error_resilience >= FF_ER_COMPLIANT){
-+ const int abs_level= ABS(level);
++ const int abs_level= FFABS(level);
+ if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
+ const int run1= run - rl->max_run[last][abs_level] - 1;
+ if(abs_level <= rl->max_level[last][run]){
@@ -536,7 +536,7 @@ otherwise GCC barfs when -fno-unit-a-time is active.
}while(cbpc == 20);
if(cbpc & 4){
-@@ -4726,309 +5029,6 @@ not_coded:
+@@ -4747,309 +5050,6 @@ not_coded:
return 0;
}
@@ -743,7 +743,7 @@ otherwise GCC barfs when -fno-unit-a-time is active.
-
-#if 0
- if(s->error_resilience >= FF_ER_COMPLIANT){
-- const int abs_level= ABS(level);
+- const int abs_level= FFABS(level);
- if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
- const int run1= run - rl->max_run[last][abs_level] - 1;
- if(abs_level <= rl->max_level[last][run]){
diff --git a/multimedia/xine-lib/patches/patch-ea b/multimedia/xine-lib/patches/patch-ea
deleted file mode 100644
index f93e5c19870..00000000000
--- a/multimedia/xine-lib/patches/patch-ea
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ea,v 1.1 2007/01/07 17:36:26 drochner Exp $
-
---- src/video_out/video_out_xv.c.orig 2006-10-28 20:51:08.000000000 +0200
-+++ src/video_out/video_out_xv.c
-@@ -187,7 +187,7 @@ static void xv_frame_dispose (vo_frame_t
-
- if (frame->image) {
-
-- if (this->use_shm) {
-+ if (frame->shminfo.shmaddr) {
- LOCK_DISPLAY(this);
- XShmDetach (this->display, &frame->shminfo);
- XFree (frame->image);
-@@ -382,6 +382,7 @@ static XvImage *create_ximage (xv_driver
-
- image = XvCreateImage (this->display, this->xv_port,
- xv_format, data, width, height);
-+ shminfo->shmaddr = 0;
- }
- return image;
- }
-@@ -391,7 +392,7 @@ static void dispose_ximage (xv_driver_t
- XShmSegmentInfo *shminfo,
- XvImage *myimage) {
-
-- if (this->use_shm) {
-+ if (shminfo->shmaddr) {
-
- XShmDetach (this->display, shminfo);
- XFree (myimage);
diff --git a/multimedia/xine-lib/patches/patch-ec b/multimedia/xine-lib/patches/patch-ec
deleted file mode 100644
index ec488b1c049..00000000000
--- a/multimedia/xine-lib/patches/patch-ec
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2007/01/09 14:46:31 drochner Exp $
-
---- src/input/libdvdnav/dvd_reader.c.orig 2007-01-09 00:09:32.000000000 +0100
-+++ src/input/libdvdnav/dvd_reader.c
-@@ -603,10 +603,12 @@ static int findDirFile( const char *path
- sprintf( filename, "%s%s%s", path,
- ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ),
- ent->d_name );
-+ closedir( dir );
- return 0;
- }
- }
-
-+ closedir( dir );
- return -1;
- }
-
diff --git a/multimedia/xine-lib/patches/patch-ed b/multimedia/xine-lib/patches/patch-ed
deleted file mode 100644
index 78e98231108..00000000000
--- a/multimedia/xine-lib/patches/patch-ed
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ed,v 1.2 2007/01/10 17:18:37 drochner Exp $
-
---- src/input/libreal/asmrp.c.orig 2006-11-29 20:43:01.000000000 +0100
-+++ src/input/libreal/asmrp.c
-@@ -418,8 +418,8 @@ static int asmrp_operand (asmrp_t *p) {
- i = asmrp_find_id (p, p->str);
- if (i<0) {
- lprintf ("error: unknown identifier %s\n", p->str);
-- }
-- ret = p->sym_tab[i].v;
-+ } else
-+ ret = p->sym_tab[i].v;
-
- asmrp_get_sym (p);
- break;
diff --git a/multimedia/xine-lib/patches/patch-ee b/multimedia/xine-lib/patches/patch-ee
new file mode 100644
index 00000000000..a603e120775
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ee
@@ -0,0 +1,22 @@
+$NetBSD: patch-ee,v 1.3 2007/02/07 20:04:00 drochner Exp $
+
+--- src/xine-engine/xine.c.orig 2007-02-07 19:58:49.000000000 +0100
++++ src/xine-engine/xine.c
+@@ -1544,6 +1544,9 @@ void xine_init (xine_t *this) {
+ /* probe for optimized memcpy or config setting */
+ xine_probe_fast_memcpy (this);
+
++ /* plugin loading might call log functions */
++ pthread_mutex_init(&this->log_lock, NULL);
++
+ /*
+ * plugins
+ */
+@@ -1622,7 +1625,6 @@ void xine_init (xine_t *this) {
+ * locks
+ */
+ pthread_mutex_init (&this->streams_lock, NULL);
+- pthread_mutex_init (&this->log_lock, NULL);
+
+ /*
+ * start metronom clock
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-20 02:47:31 +0000