Date: Wed, 8 Apr 2009 18:31:15 +0200 (CEST) From: Bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/133492: [PATCH] multimedia/libdv update to version 1.0.0 Message-ID: <20090408163115.675D1F18AF@wicklow.lan> Resent-Message-ID: <200904081640.n38Ge2HI091068@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133492
>Category: ports
>Synopsis: [PATCH] multimedia/libdv update to version 1.0.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Apr 08 16:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Bapt
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD wicklow.lan 8.0-CURRENT FreeBSD 8.0-CURRENT #9: Thu Mar 26 08:18:05 CET 2009 root@wicklow.lan:/usr/obj/usr/src/sys/WICKLOW i386
>Description:
Update to version 1.0.0, remove support for GTK 1.2 and take maintainership
>How-To-Repeat:
>Fix:
--- libdv.patch begins here ---
diff -x CVS -rNu /usr/ports/multimedia/libdv/Makefile libdv/Makefile
--- /usr/ports/multimedia/libdv/Makefile 2008-06-06 15:48:10.000000000 +0200
+++ libdv/Makefile 2009-04-08 18:27:17.542609400 +0200
@@ -6,25 +6,18 @@
#
PORTNAME= libdv
-PORTVERSION= 0.104
-PORTREVISION= 6
+PORTVERSION= 1.0.0
CATEGORIES= multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= libdv-${PORTVERSION:C/\.(.)$/\1/}
+MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= baptiste.daroussin@gmail.com
COMMENT= Quasar DV codec (libdv): software codec for DV video encoding format
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
popt.0:${PORTSDIR}/devel/popt
-USE_GNOME= gnometarget
-WANT_GNOME= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gtk-prefix="${LOCALBASE}" \
- --x-includes="${LOCALBASE}/include" \
- --x-libraries="${LOCALBASE}/lib"
+CONFIGURE_ARGS+= --disable-gtk
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${LOCALBASE}/libdata/pkgconfig
@@ -32,18 +25,12 @@
MAN1= dubdv.1 dvconnect.1 encodedv.1
-PORTDOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
+PORTDOCS= AUTHORS COPYING COPYRIGHT ChangeLog NEWS README \
README.dvconnect README.encoder TODO
-.include <bsd.port.pre.mk>
+OPTIONS+= SDL "Add SDL support" off
-.if ${HAVE_GNOME:Mgtk12}!=""
-USE_GNOME+= gtk12
-MAN1+= playdv.1
-PLIST_FILES+= bin/playdv
-.else
-CONFIGURE_ARGS+=--disable-gtk
-.endif
+.include <bsd.port.pre.mk>
# XXX - work around compiler bug
# Optimizations -O{1,s,2,3} work
@@ -51,26 +38,19 @@
# Therefore, make sure we have AT LEAST -O and avoid -O0
CONFIGURE_ENV+= CFLAGS="-O ${CFLAGS:N-O0}"
-.ifndef(WITHOUT_SDL)
+.if defined(WITH_SDL)
USE_SDL= sdl
-CONFIGURE_ARGS+= --enable-sdl
-.endif
-
-pre-everything::
-.ifndef(WITHOUT_SDL)
- @${ECHO_MSG} '===>'
- @${ECHO_MSG} '===> Define WITHOUT_SDL to disable SDL support'
- @${ECHO_MSG} '===>'
+CONFIGURE_ARGS+= --enable-sdl
.endif
post-patch:
@${REINPLACE_CMD} -E \
-e 's|(pkgconfigdir =).+(/pkgconfig)|\1 ${PREFIX}/libdata\2|' \
${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${LOCALBASE}/lib|; \
- /objformat=/s|=.*|=elf|; \
- s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \
- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+# @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${LOCALBASE}/lib|; \
+# /objformat=/s|=.*|=elf|; \
+# s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \
+# ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \
${WRKSRC}/libdv/dv.h \
${WRKSRC}/libdv/dv_types.h \
@@ -85,10 +65,6 @@
@${REINPLACE_CMD} -E -e 's|(@REQUIRES_NOPKGCONFIG@)|-L${LOCALBASE}/include \1|' \
${WRKSRC}/libdv.pc.in
-pre-configure:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
- ${WRKSRC}/configure
-
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff -x CVS -rNu /usr/ports/multimedia/libdv/distinfo libdv/distinfo
--- /usr/ports/multimedia/libdv/distinfo 2005-11-11 07:06:03.000000000 +0100
+++ libdv/distinfo 2009-04-08 16:59:18.621935825 +0200
@@ -1,3 +1,3 @@
-MD5 (libdv-0.104.tar.gz) = f6b08efce7472daa20685e6e8431f542
-SHA256 (libdv-0.104.tar.gz) = 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573
-SIZE (libdv-0.104.tar.gz) = 554691
+MD5 (libdv-1.0.0.tar.gz) = f895162161cfa4bb4a94c070a7caa6c7
+SHA256 (libdv-1.0.0.tar.gz) = a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba
+SIZE (libdv-1.0.0.tar.gz) = 574565
diff -x CVS -rNu /usr/ports/multimedia/libdv/files/patch-encodecv-dvavi.c libdv/files/patch-encodecv-dvavi.c
--- /usr/ports/multimedia/libdv/files/patch-encodecv-dvavi.c 1970-01-01 01:00:00.000000000 +0100
+++ libdv/files/patch-encodecv-dvavi.c 2004-07-21 02:33:05.000000000 +0200
@@ -0,0 +1,10 @@
+--- encodedv/dvavi.c.orig Wed Jan 14 04:29:26 2004
++++ encodedv/dvavi.c Tue Jul 20 21:07:08 2004
+@@ -31,6 +31,7 @@
+
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff -x CVS -rNu /usr/ports/multimedia/libdv/files/patch-encodedv-dvconnect.c libdv/files/patch-encodedv-dvconnect.c
--- /usr/ports/multimedia/libdv/files/patch-encodedv-dvconnect.c 1970-01-01 01:00:00.000000000 +0100
+++ libdv/files/patch-encodedv-dvconnect.c 2002-07-03 21:15:16.000000000 +0200
@@ -0,0 +1,10 @@
+--- encodedv/dvconnect.c.orig Wed Jul 3 14:44:37 2002
++++ encodedv/dvconnect.c Wed Jul 3 14:51:44 2002
+@@ -26,6 +26,7 @@
+
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #include <unistd.h>
diff -x CVS -rNu /usr/ports/multimedia/libdv/files/patch-encodedv::dvavi.c libdv/files/patch-encodedv::dvavi.c
--- /usr/ports/multimedia/libdv/files/patch-encodedv::dvavi.c 2004-07-21 02:33:05.000000000 +0200
+++ libdv/files/patch-encodedv::dvavi.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- encodedv/dvavi.c.orig Wed Jan 14 04:29:26 2004
-+++ encodedv/dvavi.c Tue Jul 20 21:07:08 2004
-@@ -31,6 +31,7 @@
-
- #include <stdio.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <fcntl.h>
diff -x CVS -rNu /usr/ports/multimedia/libdv/files/patch-encodedv::dvconnect.c libdv/files/patch-encodedv::dvconnect.c
--- /usr/ports/multimedia/libdv/files/patch-encodedv::dvconnect.c 2002-07-03 21:15:16.000000000 +0200
+++ libdv/files/patch-encodedv::dvconnect.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- encodedv/dvconnect.c.orig Wed Jul 3 14:44:37 2002
-+++ encodedv/dvconnect.c Wed Jul 3 14:51:44 2002
-@@ -26,6 +26,7 @@
-
- #include <stdio.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
- #include <sys/mman.h>
- #include <sys/time.h>
- #include <unistd.h>
diff -x CVS -rNu /usr/ports/multimedia/libdv/files/patch-playdv-oss.c libdv/files/patch-playdv-oss.c
--- /usr/ports/multimedia/libdv/files/patch-playdv-oss.c 1970-01-01 01:00:00.000000000 +0100
+++ libdv/files/patch-playdv-oss.c 2002-05-20 21:18:42.000000000 +0200
@@ -0,0 +1,22 @@
+--- playdv/oss.c.orig Sun Nov 18 21:50:24 2001
++++ playdv/oss.c Sun Nov 18 21:53:48 2001
+@@ -36,6 +36,19 @@
+
+ #include "oss.h"
+
++#ifndef O_LARGEFILE
++# define O_LARGEFILE 0
++#endif
++
++#ifndef AFMT_S16_NE
++# include <machine/endian.h>
++# if BYTE_ORDER == LITTLE_ENDIAN
++# define AFMT_S16_NE AFMT_S16_LE
++# else
++# define AFMT_S16_NE AFMT_S16_BE
++# endif
++#endif
++
+ static const char *default_device = "/dev/dsp";
+
+ dv_oss_t *
diff -x CVS -rNu /usr/ports/multimedia/libdv/files/patch-playdv:oss.c libdv/files/patch-playdv:oss.c
--- /usr/ports/multimedia/libdv/files/patch-playdv:oss.c 2002-05-20 21:18:42.000000000 +0200
+++ libdv/files/patch-playdv:oss.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
---- playdv/oss.c.orig Sun Nov 18 21:50:24 2001
-+++ playdv/oss.c Sun Nov 18 21:53:48 2001
-@@ -36,6 +36,19 @@
-
- #include "oss.h"
-
-+#ifndef O_LARGEFILE
-+# define O_LARGEFILE 0
-+#endif
-+
-+#ifndef AFMT_S16_NE
-+# include <machine/endian.h>
-+# if BYTE_ORDER == LITTLE_ENDIAN
-+# define AFMT_S16_NE AFMT_S16_LE
-+# else
-+# define AFMT_S16_NE AFMT_S16_BE
-+# endif
-+#endif
-+
- static const char *default_device = "/dev/dsp";
-
- dv_oss_t *
--- libdv.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090408163115.675D1F18AF>