diff options
| author | lioux <lioux@FreeBSD.org> | 2001-11-21 14:06:46 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2001-11-21 14:06:46 +0800 |
| commit | 664bdcc224df74e12c3503d0e391d7e69674773d (patch) | |
| tree | 8af35be1c7ac2d89492b8d19c120d3192664d752 /multimedia | |
| parent | ce7bfb64df7cfc9dfe1930e22c8e3b1874f7bbeb (diff) | |
| download | freebsd-ports-gnome-664bdcc224df74e12c3503d0e391d7e69674773d.tar.gz freebsd-ports-gnome-664bdcc224df74e12c3503d0e391d7e69674773d.tar.zst freebsd-ports-gnome-664bdcc224df74e12c3503d0e391d7e69674773d.zip | |
o Add missing USE_XLIB
o Really have SDL support unless WITHOUT_SDL
o Add patch-playdv:display.h to support SDL
o Improve patch-playdv:display.c from PR
o Install additional documentation unless NOPORTDOCS (not from PR)
PR: 31732
Submitted by: Matthew Reimer <mreimer@vpop.net>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libdv/Makefile | 26 | ||||
| -rw-r--r-- | multimedia/libdv/files/patch-playdv:display.c | 20 | ||||
| -rw-r--r-- | multimedia/libdv/files/patch-playdv:display.h | 13 | ||||
| -rw-r--r-- | multimedia/libdv/pkg-plist | 5 |
4 files changed, 55 insertions, 9 deletions
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index ba2f16bfdd01..c0a7ebe56384 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -15,22 +15,38 @@ MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - popt.0:${PORTSDIR}/devel/popt \ - SDL-1.1.3:${PORTSDIR}/devel/sdl12 + popt.0:${PORTSDIR}/devel/popt USE_GTK= yes +USE_XLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include \ -I${X11BASE}/include `${GTK_CONFIG} --cflags` \ `${GDK_PIXBUF_CONFIG} --cflags`" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib \ `${GTK_CONFIG} --libs` `${GDK_PIXBUF_CONFIG} --libs`" -CONFIGURE_ARGS= --with-sdl-prefix="${LOCALBASE}" INSTALLS_SHLIB= yes MAN1= encodedv.1 playdv.1 GDK_PIXBUF_CONFIG?=${X11BASE}/bin/gdk-pixbuf-config +SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config + +DOC_FILES= ChangeLog README.dvconnect README.encoder + +.ifndef(WITHOUT_SDL) +LIB_DEPENDS+= SDL-1.1.3:${PORTSDIR}/devel/sdl12 + +CONFIGURE_ARGS+= --enable-sdl +CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" +.endif + +pre-everything:: + @${ECHO_MSG} '===>' +.ifndef(WITHOUT_SDL) + @${ECHO_MSG} '===> Define WITHOUT_SDL to disable SDL support' +.endif + @${ECHO_MSG} '===>' post-configure: @find ${WRKSRC} -type f -name Makefile -exec \ @@ -38,6 +54,10 @@ post-configure: post-install: .ifndef(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for doc in ${DOC_FILES} + @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} +.endfor .endif .include <bsd.port.mk> diff --git a/multimedia/libdv/files/patch-playdv:display.c b/multimedia/libdv/files/patch-playdv:display.c index 02b0a85c5446..37e672dab698 100644 --- a/multimedia/libdv/files/patch-playdv:display.c +++ b/multimedia/libdv/files/patch-playdv:display.c @@ -1,29 +1,37 @@ ---- playdv/display.c.orig Sun Jun 24 13:06:30 2001 -+++ playdv/display.c Mon Nov 19 00:37:55 2001 +--- 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; ++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 ); -@@ -675,6 +677,13 @@ +@@ -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) { ++ 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 +813,8 @@ +@@ -804,7 +814,8 @@ fprintf(stderr, " Using gtk for display\n"); ok: diff --git a/multimedia/libdv/files/patch-playdv:display.h b/multimedia/libdv/files/patch-playdv:display.h new file mode 100644 index 000000000000..a734cd14f6c5 --- /dev/null +++ b/multimedia/libdv/files/patch-playdv:display.h @@ -0,0 +1,13 @@ +--- playdv/display.h.orig Sun Jun 24 13:06:30 2001 ++++ playdv/display.h Wed Nov 21 03:52:21 2001 +@@ -38,8 +38,8 @@ + #endif // HAVE_LIBXV + + #if HAVE_SDL +-#include <SDL/SDL.h> +-#include <SDL/SDL_syswm.h> ++#include <SDL.h> ++#include <SDL_syswm.h> + #endif // HAVE_SDL + + #if HAVE_GTK diff --git a/multimedia/libdv/pkg-plist b/multimedia/libdv/pkg-plist index a7bb3d132697..e513f049b4e5 100644 --- a/multimedia/libdv/pkg-plist +++ b/multimedia/libdv/pkg-plist @@ -6,4 +6,9 @@ lib/libdv.a lib/libdv.la lib/libdv.so lib/libdv.so.1 +%%PORTDOCS%%share/doc/libdv/ChangeLog +%%PORTDOCS%%share/doc/libdv/README.dvconnect +%%PORTDOCS%%share/doc/libdv/README.encoder +%%PORTDOCS%%@dirrm share/doc/libdv @dirrm include/libdv + |