summaryrefslogtreecommitdiff
path: root/multimedia/libdv/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/libdv/patches')
-rw-r--r--multimedia/libdv/patches/patch-aa6
-rw-r--r--multimedia/libdv/patches/patch-ab8
-rw-r--r--multimedia/libdv/patches/patch-ac8
-rw-r--r--multimedia/libdv/patches/patch-ad6
-rw-r--r--multimedia/libdv/patches/patch-ae82
5 files changed, 14 insertions, 96 deletions
diff --git a/multimedia/libdv/patches/patch-aa b/multimedia/libdv/patches/patch-aa
index dc3a7e5ef44..e5dfd1b8f32 100644
--- a/multimedia/libdv/patches/patch-aa
+++ b/multimedia/libdv/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/11/28 14:34:28 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/03/03 08:44:39 obache Exp $
---- libdv/Makefile.in.orig 2004-07-14 17:41:22.000000000 +0200
+--- libdv/Makefile.in.orig 2006-09-25 20:11:48.000000000 +0000
+++ libdv/Makefile.in
-@@ -55,7 +55,7 @@ CONFIG_CLEAN_FILES =
+@@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
diff --git a/multimedia/libdv/patches/patch-ab b/multimedia/libdv/patches/patch-ab
index d49568f602f..3d51b7f052c 100644
--- a/multimedia/libdv/patches/patch-ab
+++ b/multimedia/libdv/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2010/03/03 08:44:39 obache Exp $
---- encodedv/Makefile.in.orig 2004-11-30 03:23:42.000000000 +0000
+--- encodedv/Makefile.in.orig 2006-09-25 20:11:48.000000000 +0000
+++ encodedv/Makefile.in
-@@ -57,19 +57,19 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROG
+@@ -55,19 +55,19 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROG
am_dubdv_OBJECTS = insert_audio.$(OBJEXT)
dubdv_OBJECTS = $(am_dubdv_OBJECTS)
am__DEPENDENCIES_1 =
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.1 2005/06/03 15:40:31 jmmv Exp $
am_ppmqscale_OBJECTS = ppmqscale.$(OBJEXT)
ppmqscale_OBJECTS = $(am_ppmqscale_OBJECTS)
ppmqscale_LDADD = $(LDADD)
-@@ -232,18 +232,18 @@ EXTRA_DIST = $(man_MANS)
+@@ -236,18 +236,18 @@ EXTRA_DIST = $(man_MANS)
MAINTAINERCLEANFILES = Makefile.in $(AUX_DIST)
CLEANFILES =
encodedv_SOURCES = encodedv.c
diff --git a/multimedia/libdv/patches/patch-ac b/multimedia/libdv/patches/patch-ac
index f83f6a11aab..fc52320fd87 100644
--- a/multimedia/libdv/patches/patch-ac
+++ b/multimedia/libdv/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2010/03/03 08:44:39 obache Exp $
---- playdv/Makefile.in.orig 2004-11-30 03:23:43.000000000 +0000
+--- playdv/Makefile.in.orig 2006-09-25 20:11:48.000000000 +0000
+++ playdv/Makefile.in
-@@ -58,7 +58,7 @@ am_playdv_OBJECTS = playdv.$(OBJEXT) dis
+@@ -56,7 +56,7 @@ am_playdv_OBJECTS = playdv.$(OBJEXT) dis
playdv_OBJECTS = $(am_playdv_OBJECTS)
am__DEPENDENCIES_1 =
playdv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2005/06/03 15:40:31 jmmv Exp $
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -209,7 +209,7 @@ CLEANFILES =
+@@ -213,7 +213,7 @@ CLEANFILES =
AM_CFLAGS = $(SDL_CFLAGS) $(GTK_CFLAGS)
noinst_HEADERS = display.h oss.h
playdv_SOURCES = playdv.c display.c display.h oss.c
diff --git a/multimedia/libdv/patches/patch-ad b/multimedia/libdv/patches/patch-ad
index 89adb32bcaf..3b97b2e2e83 100644
--- a/multimedia/libdv/patches/patch-ad
+++ b/multimedia/libdv/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2005/06/05 09:53:07 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2010/03/03 08:44:39 obache Exp $
---- encodedv/dvconnect.c.orig 2005-05-20 19:07:43.000000000 +0200
-+++ encodedv/dvconnect.c 2005-05-20 19:08:10.000000000 +0200
+--- encodedv/dvconnect.c.orig 2004-05-31 02:05:23.000000000 +0000
++++ encodedv/dvconnect.c
@@ -29,6 +29,9 @@
#define _FILE_OFFSET_BITS 64
diff --git a/multimedia/libdv/patches/patch-ae b/multimedia/libdv/patches/patch-ae
deleted file mode 100644
index 9ffebcacdb8..00000000000
--- a/multimedia/libdv/patches/patch-ae
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/06/15 20:16:41 dogcow Exp $
---- libdv/mmx.h.orig 2001-10-27 20:23:57.000000000 -0700
-+++ libdv/mmx.h 2006-06-15 13:11:12.000000000 -0700
-@@ -272,15 +272,15 @@ mmx_ok(void)
- fprintf(stderr, #op "_m2r(" #mem "=0x%08x%08x, ", \
- mmx_trace.d[1], mmx_trace.d[0]); \
- __asm__ __volatile__ ("movq %%" #reg ", %0" \
-- : "=X" (mmx_trace) \
-+ : "=m" (mmx_trace) \
- : /* nothing */ ); \
- fprintf(stderr, #reg "=0x%08x%08x) => ", \
- mmx_trace.d[1], mmx_trace.d[0]); \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (mem)); \
-+ : "m" (mem)); \
- __asm__ __volatile__ ("movq %%" #reg ", %0" \
-- : "=X" (mmx_trace) \
-+ : "=m" (mmx_trace) \
- : /* nothing */ ); \
- fprintf(stderr, #reg "=0x%08x%08x\n", \
- mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -290,7 +290,7 @@ mmx_ok(void)
- { \
- mmx_t mmx_trace; \
- __asm__ __volatile__ ("movq %%" #reg ", %0" \
-- : "=X" (mmx_trace) \
-+ : "=m" (mmx_trace) \
- : /* nothing */ ); \
- fprintf(stderr, #op "_r2m(" #reg "=0x%08x%08x, ", \
- mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -298,7 +298,7 @@ mmx_ok(void)
- fprintf(stderr, #mem "=0x%08x%08x) => ", \
- mmx_trace.d[1], mmx_trace.d[0]); \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ ); \
- mmx_trace = (mem); \
- fprintf(stderr, #mem "=0x%08x%08x\n", \
-@@ -338,8 +338,8 @@ mmx_ok(void)
- __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- #op " %1, %%mm0\n\t" \
- "movq %%mm0, %0" \
-- : "=X" (memd) \
-- : "X" (mems)); \
-+ : "=m" (memd) \
-+ : "m" (mems)); \
- mmx_trace = (memd); \
- fprintf(stderr, #memd "=0x%08x%08x\n", \
- mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -353,16 +353,16 @@ mmx_ok(void)
- #define mmx_i2r(op, imm, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (imm) )
-+ : "i" (imm) )
-
- #define mmx_m2r(op, mem, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (mem))
-+ : "m" (mem))
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
-@@ -372,8 +372,8 @@ mmx_ok(void)
- __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- #op " %1, %%mm0\n\t" \
- "movq %%mm0, %0" \
-- : "=X" (memd) \
-- : "X" (mems))
-+ : "=m" (memd) \
-+ : "m" (mems))
-
- #endif
-