diff options
| author | lioux <lioux@FreeBSD.org> | 2002-11-05 03:49:52 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2002-11-05 03:49:52 +0800 |
| commit | dc401c2af65fa4d1f6aabddae3b5f198a3145dbe (patch) | |
| tree | a9d4aa53349f6e4ac30137ba4f5427f180d56426 /multimedia | |
| parent | 7ebb4ae4b5a650fdc2f6120f7ff16e8321ae05cd (diff) | |
| download | freebsd-ports-graphics-dc401c2af65fa4d1f6aabddae3b5f198a3145dbe.tar.gz freebsd-ports-graphics-dc401c2af65fa4d1f6aabddae3b5f198a3145dbe.tar.zst freebsd-ports-graphics-dc401c2af65fa4d1f6aabddae3b5f198a3145dbe.zip | |
o Fix build in -STABLE
o Enable port to locate lame libs in a PREFIX safe environment
o Bump PORTREVISION
PR: 44885
Submitted by: somebody@kashmir.etowns.net,
MAINTAINER
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/transcode/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/transcode/files/patch-src:export:Makefile.in | 13 | ||||
| -rw-r--r-- | multimedia/transcode/files/patch-src:filter:preview:pv.c | 29 |
3 files changed, 31 insertions, 13 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index f495d74f8ae..380bc457e4c 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,6 +7,7 @@ PORTNAME= transcode PORTVERSION= 0.6.2 +PORTREVISION= 1 DISTNAME= ${PORTNAME}-${PORTVERSION}.20021010 CATEGORIES= graphics MASTER_SITES= http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/ @@ -180,6 +181,7 @@ PLIST_SUB+= WITH_LIBA52="@comment " .if defined(WITH_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame +CONFIGURE_ARGS+= --with-lame-libs=${LOCALBASE}/lib PLIST_SUB+= WITH_LAME="" .else CONFIGURE_ARGS+= --with-lame=no diff --git a/multimedia/transcode/files/patch-src:export:Makefile.in b/multimedia/transcode/files/patch-src:export:Makefile.in deleted file mode 100644 index 94ed7e8b264..00000000000 --- a/multimedia/transcode/files/patch-src:export:Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- export/Makefile.in.orig Tue Sep 3 23:56:33 2002 -+++ export/Makefile.in Tue Sep 3 23:58:12 2002 -@@ -536,7 +536,9 @@ - export_ffmpeg.la: $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_DEPENDENCIES) - $(LINK) -rpath $(pkgdir) $(export_ffmpeg_la_LDFLAGS) $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_LIBADD) $(LIBS) - export_ffmpeg4.la: $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_DEPENDENCIES) -- $(LINK) -rpath $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS) -+ $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) \ -+ $(AM_LDFLAGS) -o $@ -IWRKSRC/ffmpeg/libavcodec -rpath \ -+ $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS) - export_im.la: $(export_im_la_OBJECTS) $(export_im_la_DEPENDENCIES) - $(LINK) -rpath $(pkgdir) $(export_im_la_LDFLAGS) $(export_im_la_OBJECTS) $(export_im_la_LIBADD) $(LIBS) - export_iv50.la: $(export_iv50_la_OBJECTS) $(export_iv50_la_DEPENDENCIES) diff --git a/multimedia/transcode/files/patch-src:filter:preview:pv.c b/multimedia/transcode/files/patch-src:filter:preview:pv.c new file mode 100644 index 00000000000..8c74a4a84c6 --- /dev/null +++ b/multimedia/transcode/files/patch-src:filter:preview:pv.c @@ -0,0 +1,29 @@ +--- filter/preview/pv.c.orig Mon Nov 4 18:38:27 2002 ++++ filter/preview/pv.c Mon Nov 4 18:39:27 2002 +@@ -38,7 +38,7 @@ + #include <sys/shm.h> + + #ifdef __FreeBSD__ /* We don't have on_exit() */ +-dv_display_t *dv_dpy_on_exit_hack = NULL; ++xv_display_t *xv_dpy_on_exit_hack = NULL; + #endif + + #define XV_FORMAT_MASK 0x03 +@@ -128,7 +128,7 @@ + free(dv_dpy); + dv_dpy = NULL; + #ifdef __FreeBSD__ +- dv_dpy_on_exit_hack = NULL; ++ xv_dpy_on_exit_hack = NULL; + #endif + } // xv_display_exit + +@@ -536,7 +536,7 @@ + } + + #ifdef __FreeBSD__ +- dv_dpy_on_exit_hack = dv_dpy; ++ xv_dpy_on_exit_hack = dv_dpy; + atexit(xv_display_on_exit_hack_handler); + #else + on_exit(xv_display_exit_handler, dv_dpy); |