diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-09-04 20:44:23 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-09-04 20:44:23 +0000 |
| commit | 58aac43ebcf2ffad6b29f08e9fa257567b6d9265 (patch) | |
| tree | d0d3418a6c06a5e0e943322d946952569c209bb9 /multimedia/libdv | |
| parent | fa5a43b10d158ff2110f31b521458ab390d76423 (diff) | |
| download | ports-58aac43ebcf2ffad6b29f08e9fa257567b6d9265.tar.gz ports-58aac43ebcf2ffad6b29f08e9fa257567b6d9265.zip | |
Notes
Diffstat (limited to 'multimedia/libdv')
| -rw-r--r-- | multimedia/libdv/Makefile | 15 | ||||
| -rw-r--r-- | multimedia/libdv/distinfo | 2 | ||||
| -rw-r--r-- | multimedia/libdv/files/patch-playdv:display.c | 43 | ||||
| -rw-r--r-- | multimedia/libdv/pkg-plist | 3 |
4 files changed, 12 insertions, 51 deletions
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 2f9e3c12e5db..f04ee36b0352 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -6,11 +6,11 @@ # PORTNAME= libdv -PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTVERSION= 0.9.8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= libdv-${PORTVERSION:C/\.(.)$/\1/} MAINTAINER= lioux@FreeBSD.org @@ -61,20 +61,23 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -E \ - -e 's|(pkgconfigdir =).+(/pkgconfig)|\1 ${LOCALBASE}/libdata\2|' \ + -e 's|(pkgconfigdir =).+(/pkgconfig)|\1 ${PREFIX}/libdata\2|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${X11BASE}/lib|; \ s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \ ${WRKSRC}/libdv/dv_types.h \ + ${WRKSRC}/libdv/headers.c \ ${WRKSRC}/libdv/encode.c @${REINPLACE_CMD} -E -e 's|^void swab.+$$||' ${WRKSRC}/libdv/encode.c - @${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/playdv/display.h + @${REINPLACE_CMD} -e 's|SDL/||' ${WRKSRC}/playdv/display.h @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/encodedv/dvavi.c \ ${WRKSRC}/encodedv/dvconnect.c - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/encodedv/Makefile.in +# XXX - revise at every port update +# protect popt from prefix changes + @${REINPLACE_CMD} -E -e 's|(@REQUIRES_NOPKGCONFIG@)|-L${LOCALBASE}/include \1|' \ + ${WRKSRC}/libdv.pc.in post-install: .ifndef(NOPORTDOCS) diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo index bae66fd35867..99c254ac08e3 100644 --- a/multimedia/libdv/distinfo +++ b/multimedia/libdv/distinfo @@ -1 +1 @@ -MD5 (libdv-0.9.5.tar.gz) = bfe00ab2e99e867738221d8e31e739e0 +MD5 (libdv-0.98.tar.gz) = 9b536c093869f171de1b4179885e43fb diff --git a/multimedia/libdv/files/patch-playdv:display.c b/multimedia/libdv/files/patch-playdv:display.c deleted file mode 100644 index 37e672dab698..000000000000 --- a/multimedia/libdv/files/patch-playdv:display.c +++ /dev/null @@ -1,43 +0,0 @@ ---- playdv/display.c.orig Wed Nov 21 03:47:29 2001 -+++ playdv/display.c Wed Nov 21 03:51:04 2001 -@@ -47,6 +47,8 @@ - #include <popt.h> - #endif - -+dv_display_t *dv_dpy_on_exit_hack = NULL; -+ - static int dv_display_SDL_init(dv_display_t *dv_dpy, gchar *w_name, gchar *i_name ); - static gboolean dv_display_gdk_init(dv_display_t *dv_dpy, gint *argc, gchar ***argv ); - -@@ -257,6 +259,7 @@ - } /* switch */ - - free(dv_dpy); -+ dv_dpy_on_exit_hack = NULL; - } /* dv_display_exit */ - - static gboolean -@@ -675,6 +678,13 @@ - } /* if */ - } /* dv_display_exit_handler */ - -+static void -+dv_display_on_exit_hack_handler() -+{ -+ if(dv_dpy_on_exit_hack != NULL) { -+ dv_display_exit(dv_dpy_on_exit_hack); -+ } /* if */ -+} /* dv_display_exit_handler */ - - gboolean - dv_display_init(dv_display_t *dv_dpy, gint *argc, gchar ***argv, gint width, gint height, -@@ -804,7 +814,8 @@ - fprintf(stderr, " Using gtk for display\n"); - - ok: -- on_exit(dv_display_exit_handler, dv_dpy); -+ dv_dpy_on_exit_hack = dv_dpy; -+ atexit(dv_display_on_exit_hack_handler); - return(TRUE); - - fail: diff --git a/multimedia/libdv/pkg-plist b/multimedia/libdv/pkg-plist index e6b7b87fb787..61186531bdc9 100644 --- a/multimedia/libdv/pkg-plist +++ b/multimedia/libdv/pkg-plist @@ -5,7 +5,7 @@ include/libdv/dv1394.h include/libdv/dv_types.h lib/libdv.a lib/libdv.so -lib/libdv.so.1 +lib/libdv.so.2 libdata/pkgconfig/libdv.pc %%PORTDOCS%%share/doc/libdv/AUTHORS %%PORTDOCS%%share/doc/libdv/COPYING @@ -17,4 +17,5 @@ libdata/pkgconfig/libdv.pc %%PORTDOCS%%share/doc/libdv/README.encoder %%PORTDOCS%%share/doc/libdv/TODO %%PORTDOCS%%@dirrm share/doc/libdv +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true @dirrm include/libdv |