summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/libdv-tools/Makefile13
-rw-r--r--multimedia/libdv/Makefile6
-rw-r--r--multimedia/libdv/Makefile.common6
-rw-r--r--multimedia/libdv/distinfo17
-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
9 files changed, 33 insertions, 119 deletions
diff --git a/multimedia/libdv-tools/Makefile b/multimedia/libdv-tools/Makefile
index dbc1e4652bd..1495cc9ef36 100644
--- a/multimedia/libdv-tools/Makefile
+++ b/multimedia/libdv-tools/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:25 reed Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/03 08:44:39 obache Exp $
.include "../../multimedia/libdv/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-tools-/}
-PKGREVISION= 1
COMMENT+= (standalone tools)
-CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-gtk/--enable-gtk/g}
+USE_TOOLS+= pkg-config
-BUILD_DIRS= ${WRKSRC}/encodedv ${WRKSRC}/playdv
-INSTALL_DIRS= ${WRKSRC}/encodedv ${WRKSRC}/playdv
+CONFIGURE_ARGS+= --enable-gtk
-BUILDLINK_API_DEPENDS.libdv+= libdv>=0.104nb1
+BUILD_DIRS= encodedv playdv
+INSTALL_DIRS= encodedv playdv
+
+BUILDLINK_API_DEPENDS.libdv+= libdv>=1.0.0
.include "../../devel/glib/buildlink3.mk"
.include "../../multimedia/libdv/buildlink3.mk"
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 4fd56e3a0f1..a9a32fb08a1 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/12/15 15:30:16 heinz Exp $
-
-PKG_DESTDIR_SUPPORT= user-destdir
+# $NetBSD: Makefile,v 1.14 2010/03/03 08:44:38 obache Exp $
.include "Makefile.common"
-PKGREVISION= 2
+CONFIGURE_ARGS+= --disable-gtk
MAKE_FLAGS+= SUBDIRS=libdv
diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common
index 90405d33247..df2394cd5dc 100644
--- a/multimedia/libdv/Makefile.common
+++ b/multimedia/libdv/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.10 2010/03/03 07:55:51 obache Exp $
+# $NetBSD: Makefile.common,v 1.11 2010/03/03 08:44:38 obache Exp $
#
# used by multimedia/libdv-tools/Makefile
-DISTNAME= libdv-0.104
+DISTNAME= libdv-1.0.0
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libdv/}
@@ -22,8 +22,6 @@ USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= ${WRKSRC}/libdv.pc.in
PTHREAD_AUTO_VARS= yes
-CONFIGURE_ARGS+= --disable-gtk
-
.include "../../mk/bsd.prefs.mk"
.if (${OPSYS} == "Darwin") || empty(MACHINE_PLATFORM:M*-*-i386) || (${OPSYS} == "Interix")
diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo
index 70618837aae..a5ffade9879 100644
--- a/multimedia/libdv/distinfo
+++ b/multimedia/libdv/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/06/15 20:16:41 dogcow Exp $
+$NetBSD: distinfo,v 1.9 2010/03/03 08:44:38 obache Exp $
-SHA1 (libdv-0.104.tar.gz) = 521a079193f4ae8f9995091b0590c87fde130650
-RMD160 (libdv-0.104.tar.gz) = a91708ecb75533caf2b9038ca68064c7707dcfdf
-Size (libdv-0.104.tar.gz) = 554691 bytes
-SHA1 (patch-aa) = 6910450f2c93ac4989e8c132368d208ddd65cf0d
-SHA1 (patch-ab) = f204ba8b80f48a5965397beb2239b44b45ca8920
-SHA1 (patch-ac) = a8d1fd55c9bf3ee59f34613e285314def3add60b
-SHA1 (patch-ad) = 7b65a66a54c49e5bb7e902ba0cfc67f882b344f0
-SHA1 (patch-ae) = c4bd957fa444f7142b53c623129cacfcb4d3d227
+SHA1 (libdv-1.0.0.tar.gz) = 2e5ba0e95f665d60e72cbebcf1c4989e0d6c92c8
+RMD160 (libdv-1.0.0.tar.gz) = a8d3ae083340cec411d5294db7197ea72c8b3c4f
+Size (libdv-1.0.0.tar.gz) = 574565 bytes
+SHA1 (patch-aa) = bd8c5caebd6a1d3c3276a3a41d47920fcefae7f0
+SHA1 (patch-ab) = b0798b112c586b041d29d498221dc772387f1c22
+SHA1 (patch-ac) = 8b60cb4ccf3f8cf5d56fd7336830e14c9c704b6d
+SHA1 (patch-ad) = f496833eea654934b80ecad5cd3be1f9c8ddd848
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
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 00:51:56 +0000