diff options
author | drochner <drochner> | 2003-02-13 19:04:47 +0000 |
---|---|---|
committer | drochner <drochner> | 2003-02-13 19:04:47 +0000 |
commit | 26dfbbaa9430d1a606672640f2379b7282820b63 (patch) | |
tree | 78c154bc106ac68fb4f577abab593f997c510ca7 | |
parent | 3d242c4d6db101758481df9996099e8eb421fb42 (diff) | |
download | pkgsrc-26dfbbaa9430d1a606672640f2379b7282820b63.tar.gz |
update to 1.2.2
changes:
-use libvideogfx
-USE_BUILDLINK2
-GNU_CONFIGURE
-rw-r--r-- | graphics/dvdview/Makefile | 36 | ||||
-rw-r--r-- | graphics/dvdview/distinfo | 12 | ||||
-rw-r--r-- | graphics/dvdview/patches/patch-aa | 34 | ||||
-rw-r--r-- | graphics/dvdview/patches/patch-ab | 74 | ||||
-rw-r--r-- | graphics/dvdview/patches/patch-ac | 13 | ||||
-rw-r--r-- | graphics/dvdview/patches/patch-ad | 12 |
6 files changed, 75 insertions, 106 deletions
diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile index 83b59e03ca2..f47a109eb42 100644 --- a/graphics/dvdview/Makefile +++ b/graphics/dvdview/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:35 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2003/02/13 19:04:47 drochner Exp $ -DISTNAME= dvdview1.1.0 -PKGNAME= dvdview-1.1.0 -PKGREVISION= 1 +DISTNAME= dvdview-1.2.2 CATEGORIES= graphics -MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/arch/ +MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/data/ MAINTAINER= tron@netbsd.org HOMEPAGE= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/ @@ -13,40 +11,20 @@ COMMENT= Software only MPEG-1/2 video decoder GNU_CONFIGURE= YES USE_GMAKE= YES USE_X11= YES +USE_BUILDLINK2= yes .include "../../mk/bsd.prefs.mk" -.if !defined(WRKSRC) -do-configure: - @${SETENV} WRKSRC=${WRKDIR}/ulib ${MAKE} ${.TARGET} - @${SETENV} WRKSRC=${WRKDIR}/dvdview ${MAKE} ${.TARGET} - -do-build: - @${SETENV} WRKSRC=${WRKDIR}/ulib ${MAKE} ${.TARGET} - @${SETENV} WRKSRC=${WRKDIR}/dvdview/src ${MAKE} ${.TARGET} -.endif - -ALL_TARGET= # empty -WRKSRC?= ${WRKDIR}/dvdview .if (${OPSYS} == SunOS) MAKE_ENV+= RTLIB=-lrt .else MAKE_ENV+= RTLIB= .endif -.if (${OPSYS} != "Linux") && (${MACHINE_ARCH} == i386) -post-configure: - cd ${WRKSRC} && \ - for FILE in ../ulib/config.h src/config.h; do \ - ${CP} $$FILE $${FILE}.old; \ - ${SED} -e 's/#define ENABLE_MMX 1/#undef ENABLE_MMX/' \ - $${FILE}.old >$${FILE}; \ - done -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/dvdview ${PREFIX}/bin +post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dvdview ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdview +.include "../../graphics/libvideogfx/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/dvdview/distinfo b/graphics/dvdview/distinfo index b86d0f9b791..b97e77ef390 100644 --- a/graphics/dvdview/distinfo +++ b/graphics/dvdview/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.7 2001/08/30 22:56:42 elric Exp $ +$NetBSD: distinfo,v 1.8 2003/02/13 19:04:47 drochner Exp $ -SHA1 (dvdview1.1.0.tar.gz) = d3f6837f17834c5849f93308b994e70e056b0ffe -Size (dvdview1.1.0.tar.gz) = 242440 bytes -SHA1 (patch-aa) = 89b3ac7a3f4f5f3ed6722d6253f341ce849e6d37 -SHA1 (patch-ab) = 011846d72d7fb8f0f6be2d18dc1e2ff6015032fe -SHA1 (patch-ac) = f6d7c9b7d8fa9369a302987f600b91011113e2cf -SHA1 (patch-ad) = 4a90ca2d32212fde2fac131a05c843644aaa5eff +SHA1 (dvdview-1.2.2.tar.gz) = d7d00aee0a5553f97b5a7673d7fa7174d173c12e +Size (dvdview-1.2.2.tar.gz) = 209143 bytes +SHA1 (patch-aa) = b691e2988b1394002a1e57512216cdf55a592665 +SHA1 (patch-ab) = 6509989ade7aff868c15436b859679ddd6b35a36 diff --git a/graphics/dvdview/patches/patch-aa b/graphics/dvdview/patches/patch-aa index cf3de422f79..67d532e16bd 100644 --- a/graphics/dvdview/patches/patch-aa +++ b/graphics/dvdview/patches/patch-aa @@ -1,23 +1,15 @@ -$NetBSD: patch-aa,v 1.2 2001/04/23 20:28:05 tron Exp $ +$NetBSD: patch-aa,v 1.3 2003/02/13 19:04:48 drochner Exp $ ---- ../ulib/Makefile.in.orig Mon Sep 25 15:30:05 2000 -+++ ../ulib/Makefile.in Mon Apr 23 22:25:49 2001 -@@ -41,13 +41,13 @@ +--- src/guis/shell/main_shell.cc.orig Tue Feb 4 13:01:17 2003 ++++ src/guis/shell/main_shell.cc Tue Feb 4 13:07:30 2003 +@@ -463,8 +463,10 @@ + #if HAVE_X11 + outputobject = &videosink_x11; - CC = @CC@ - AR = ar --SHELL = /bin/bash -+#SHELL = /bin/bash - PROFILEFLAGS = - DEBUGFLAGS = -g --CFLAGS = $(PROFILEFLAGS) $(DEBUGFLAGS) --OPTIMIZE = -O99 --INCLUDES = -I/usr/include/g++ -I$(ULIBROOT) -I. # -I$(QTROOT)/include --LNPATH = -L/usr/X11R6/lib # -L$(QTROOT)/lib -+#CFLAGS = $(PROFILEFLAGS) $(DEBUGFLAGS) -+#OPTIMIZE = -O99 -+INCLUDES = -I$(X11BASE)/include -I$(ULIBROOT) -I. # -I$(QTROOT)/include -+LNPATH = -L$(X11BASE)/lib # -L$(QTROOT)/lib - CPPFLAGS = $(INCLUDES) - LNFLAGS = $(LNPATH) $(PROFILEFLAGS) $(DEBUGFLAGS) - DEFS = # -DNDEBUG # -DLINUX_VCD # -DUSE_MMX ++#if 0 + if (!default_x11server.AskDisplay()) + { cerr << "Cannot open display.\n"; throw "no display"; } ++#endif + #endif + resizer = &pp_resize; + #endif diff --git a/graphics/dvdview/patches/patch-ab b/graphics/dvdview/patches/patch-ab index 60906fbb679..6e0907f3154 100644 --- a/graphics/dvdview/patches/patch-ab +++ b/graphics/dvdview/patches/patch-ab @@ -1,29 +1,55 @@ -$NetBSD: patch-ab,v 1.3 2001/06/30 22:13:15 tron Exp $ +$NetBSD: patch-ab,v 1.4 2003/02/13 19:04:48 drochner Exp $ ---- src/Makefile.in.orig Mon Sep 25 17:43:10 2000 -+++ src/Makefile.in Sun Jul 1 00:09:24 2001 -@@ -42,18 +42,18 @@ - OBJS = $(COMMONOBJS) @OBJLIST@ # $(ARCHOBJS) $(MOCOBJS) +--- configure.orig Wed Feb 5 23:06:22 2003 ++++ configure Wed Feb 5 23:10:08 2003 +@@ -3406,41 +3406,6 @@ + fi - CC = @CC@ --SHELL = /bin/bash -+#SHELL = /bin/bash - PROFILEFLAGS = - DEBUGFLAGS = -g --CFLAGS = $(PROFILEFLAGS) $(DEBUGFLAGS) --OPTIMIZE = -O3 --INCLUDES = -I/usr/include/g++ -I$(ULIBROOT) -I. # -I$(QTROOT)/include --LNPATH = -L/usr/X11R6/lib # -L$(QTROOT)/lib -+#CFLAGS = $(PROFILEFLAGS) $(DEBUGFLAGS) -+#OPTIMIZE = -O3 -+INCLUDES = -I$(X11BASE)/include -I$(ULIBROOT) -I. # -I$(QTROOT)/include -+LNPATH = $(LDFLAGS) - CPPFLAGS = $(INCLUDES) - LNFLAGS = $(LNPATH) $(PROFILEFLAGS) $(DEBUGFLAGS) - DEFS = # -DNDEBUG --LIBS = -lXext -lX11 -lstdc++ -lm -+LIBS = -lXext -lX11 -lstdc++ -lm $(RTLIB) +-echo "$as_me:$LINENO: checking for MMX support" >&5 +-echo $ECHO_N "checking for MMX support... $ECHO_C" >&6 +-case $target_cpu in +- i?86) echo "$as_me:$LINENO: result: found, using MMX optimized code" >&5 +-echo "${ECHO_T}found, using MMX optimized code" >&6 +- cat >>confdefs.h <<\_ACEOF +-#define ENABLE_MMX 1 +-_ACEOF +- +- cat >>confdefs.h <<\_ACEOF +-#define UNALIGNED_MEMORYACCESS 1 +-_ACEOF +- +- +- +-if true; then +- ENABLE_MMX_TRUE= +- ENABLE_MMX_FALSE='#' +-else +- ENABLE_MMX_TRUE='#' +- ENABLE_MMX_FALSE= +-fi +- +- +- +-if true; then +- ENABLE_CPU_X86_TRUE= +- ENABLE_CPU_X86_FALSE='#' +-else +- ENABLE_CPU_X86_TRUE='#' +- ENABLE_CPU_X86_FALSE= +-fi +- ;; +- *) echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 - %.d: %.cc + if false; then +@@ -3460,8 +3425,6 @@ + ENABLE_CPU_X86_TRUE='#' + ENABLE_CPU_X86_FALSE= + fi +- ;; +-esac + + echo "$as_me:$LINENO: checking for Linux" >&5 + echo $ECHO_N "checking for Linux... $ECHO_C" >&6 diff --git a/graphics/dvdview/patches/patch-ac b/graphics/dvdview/patches/patch-ac deleted file mode 100644 index a53d31a347c..00000000000 --- a/graphics/dvdview/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/04/22 07:24:47 tron Exp $ - ---- ../ulib/x11/imgwin.cc.orig Mon Jul 31 13:12:04 2000 -+++ ../ulib/x11/imgwin.cc Sun Apr 22 09:20:53 2001 -@@ -138,7 +138,7 @@ - #if 1 - XSizeHints sizeh; - sizeh.flags = PSize; //|PMinSize|PMaxSize; -- if (d_xpos>=0 && d_ypos>=0) sizeh.flags |= PPosition; -+// if (d_xpos>=0 && d_ypos>=0) sizeh.flags |= PPosition; - sizeh.width = w; - sizeh.height = h; - sizeh.min_width = w; diff --git a/graphics/dvdview/patches/patch-ad b/graphics/dvdview/patches/patch-ad deleted file mode 100644 index e16da6994ec..00000000000 --- a/graphics/dvdview/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/08/30 22:56:05 elric Exp $ - ---- src/main.cc.orig Wed Oct 4 12:07:09 2000 -+++ src/main.cc Fri May 18 19:43:20 2001 -@@ -211,6 +211,7 @@ - { - SysPacket_Packet* pck = audio_extractor.GetNextPacket(); - fwrite(pck->data.AskContents(),pck->data.AskLength(),1,stdout); -+ fflush(stdout); - delete pck; - } - |