Date: Thu, 26 Sep 2002 00:48:17 -0700 (PDT) From: <adam@vectors.cx> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hendrik@scholz.net Subject: ports/43379: [patch] update and a bunch of fixes for graphics/transcode Message-ID: <200209260748.g8Q7mH64083440@vectors.cx>
next in thread | raw e-mail | index | archive | help
>Number: 43379
>Category: ports
>Synopsis: [patch] update and a bunch of fixes for graphics/transcode
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 26 00:50:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:
>Release: FreeBSD 4.7-RC i386
>Organization:
>Environment:
System: FreeBSD smacky.vectors.cx 4.7-RC FreeBSD 4.7-RC #23: Tue Sep 24 14:52:55 PDT 2002 root@smacky.vectors.cx:/usr/src/sys/compile/smacky i386
>Description:
first of all, in its current state, graphics/transcode will not build.
past that, it has a bunch of tiny problems. these patches do the
following:
1) update from 0.6.0.5_1 to 0.6.2.20020923
2) USE_GNOME didn't reference gtk12. it generated errors when it ran as a result
3) perl -> reinplace
4) used WITH_LIBFAME in some places, WITH_FAME in others. so libfame never got
linked in.
5) the port now acknowledges and will enable ogg modules and mjpeg modules
6) the port no longer will compile libmpeg2 modules
7) in checking for libfame, it looked for a (nonexistant) program, fame. this
now checks for the appropriate lib.
8) if you don't use the avifile libs, it defines WITHOUT_FFMPEG, which was never
used again. this supports WITHOUT_FFMPEG now.
9) added -lglib -> -lglib12 changes to configure script
10) in ${WRKSRC}/export, the ffmpeg libs and a provided ac3 lib have a number of
function name conflicts, which prevent the program from compiling. a new patch
is provided to remove the ac3 libs from the ffmpeg compilation process. this
didn't cause any problems for me running the program.
>How-To-Repeat:
>Fix:
provided: patches for Makefile, pkg-plist, and distinfo, and a new file for the
files/ directory.
--- patch-Makefile begins here ---
--- Makefile.orig Wed Sep 25 22:37:39 2002
+++ Makefile Thu Sep 26 00:14:27 2002
@@ -6,26 +6,25 @@
#
PORTNAME= transcode
-PORTVERSION= 0.6.0.5
-PORTREVISION= 1
+PORTVERSION= 0.6.2.20020923
CATEGORIES= graphics
MASTER_SITES= http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/.5$//g}pre5
-EXTRACT_SUFX= .tgz
MAINTAINER= hendrik@scholz.net
LIB_DEPENDS= dvdread.2:${PORTSDIR}/graphics/libdvdread \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+ jpeg.9:${PORTSDIR}/graphics/jpeg
USE_XLIB= yes
USE_GNOMENG= yes
-USE_GNOME= glib12
+USE_GNOME= glib12 gtk12
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnugetopt" \
SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+USE_REINPLACE= yes
MAN1= transcode.1 tccat.1 avisplit.1 avimerge.1 avifix.1
@@ -68,7 +67,7 @@
.endif
.if exists(${LOCALBASE}/lib/libfame.so)
-WITH_LIBFAME= yes
+WITH_FAME= yes
.endif
.if exists(${LOCALBASE}/lib/libxvidcore.so)
@@ -88,6 +87,14 @@
WITH_LAME= yes
.endif
+.if exists(${LOCALBASE}/lib/libogg.so)
+WITH_OGG= yes
+.endif
+
+.if exists(${LOCALBASE}/lib/liblavplay.so)
+WITH_MJPEG= yes
+.endif
+
.if defined(WITH_IMAGEMAGICK)
LIB_DEPENDS+= Magick.5:${PORTSDIR}/graphics/ImageMagick
PLIST_SUB+= WITH_IMAGEMAGICK=""
@@ -126,7 +133,7 @@
PLIST_SUB+= WITH_LIBXML2="@comment "
.endif
-.if defined(WITH_FFMPEG)
+.if defined(WITH_FFMPEG) && !defined(WITHOUT_FFMPEG)
BUILD_DEPENDS+= ${LOCALBASE}/bin/ffmpeg:${PORTSDIR}/graphics/ffmpeg
PLIST_SUB+= WITH_FFMPEG=""
.else
@@ -147,11 +154,8 @@
CONFIGURE_ARGS+= --with-openqt=no
.endif
-.if defined(WITH_LIBMPEG2)
-LIB_DEPENDS+= mpeg2.0:${PORTSDIR}/graphics/libmpeg2
-.endif
.if defined(WITH_FAME)
-LIB_DEPENDS+= fame:${PORTSDIR}/graphics/libfame
+LIB_DEPENDS+= fame-0.9.0:${PORTSDIR}/graphics/libfame
PLIST_SUB+= WITH_FAME=""
.else
PLIST_SUB+= WITH_FAME="@comment "
@@ -183,6 +187,21 @@
PLIST_SUB+= WITH_LAME="@comment "
.endif
+.if defined(WITH_OGG)
+LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg
+CONFIGURE_ARGS+= --with-ogg=yes
+PLIST_SUB+= WITH_OGG=""
+.else
+PLIST_SUB+= WITH_OGG="@comment "
+.endif
+
+.if defined(WITH_MJPEG)
+LIB_DEPENDS+= lavplay-1.6.0:${PORTSDIR}/graphics/mjpegtools
+PLIST_SUB+= WITH_MJPEG=""
+.else
+PLIST_SUB+= WITH_MJPEG="@comment "
+.endif
+
pre-everything::
.if !defined(WITH_OPTIMIZED_CFLAGS)
@${ECHO_MSG}
@@ -203,7 +222,7 @@
@${ECHO_MSG}
@${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_LIBXML2."
.endif
-.if !defined(WITH_FFMPEG)
+.if !defined(WITH_FFMPEG) || defined(WITHOUT_FFMEG)
@${ECHO_MSG}
@${ECHO_MSG} "You can enable ffmpeg-dependent modules by defining WITH_FFMPEG."
.endif
@@ -255,25 +274,35 @@
@${ECHO_MSG} "You will probably want to enable this, if you plan to"
@${ECHO_MSG} "rip DVDs."
.endif
+.if !defined(WITH_OGG)
+ @${ECHO_MSG}
+ @${ECHO_MSG} "You can enable libogg support by defining WITH_OGG."
+.endif
+.if !defined(WITH_MJPEG)
+ @${ECHO_MSG}
+ @${ECHO_MSG} "You can enable support for the MJPEG toolkit by"
+ @${ECHO_MSG} "defining WITH_MJPEG."
+.endif
post-patch:
.if ${OSVERSION} <= 500027
- @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${PERL} -pi \
+ @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \
-e 's|<stdint.h>|<inttypes.h>|'
.endif
.if !defined(WITH_OPTIMIZED_CFLAGS)
- @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${PERL} -pi \
+ @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \
-e 's|-O[236]|${CFLAGS}|'
.endif
- @${PERL} -pi -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c
- @${PERL} -pi -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
+ @${REINPLACE_CMD} -E -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c
+ @${REINPLACE_CMD} -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
- @${PERL} -pi -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
+ @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
pre-configure:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @${PERL} -pi -e 's|-ldl||g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g; \
+ s|-lglib|-lglib12|g; \
+ s|-ldl||g' ${WRKSRC}/configure
post-install:
.if defined(WITH_XVID)
--- patch-Makefile ends here ---
--- patch-distinfo begins here ---
--- distinfo.orig Wed Sep 25 22:37:19 2002
+++ distinfo Wed Sep 25 22:39:55 2002
@@ -1 +1 @@
-MD5 (transcode-0.6.0pre5.tgz) = f791b1aac090312459e3e9cec2d1fd6e
+MD5 (transcode-0.6.2.20020923.tar.gz) = 283bb4084957f240e46c0e77d8f69796
--- patch-distinfo ends here ---
--- patch-pkg-plist begins here ---
--- pkg-plist.orig Thu Sep 26 00:21:15 2002
+++ pkg-plist Thu Sep 26 00:20:41 2002
@@ -34,6 +34,8 @@
lib/transcode/import_mjpeg.so
lib/transcode/af6_decore.so
%%WITH_LIBXML2%%lib/transcode/import_xml.so
+%%WITH_OGG%%lib/transcode/import_ogg.so
+%%WITH_MJPEG%%lib/transcode/import_mjpeg.so
lib/transcode/filter_null.so
lib/transcode/filter_32detect.so
lib/transcode/filter_32drop.so
@@ -70,6 +72,8 @@
lib/transcode/export_xvidcvs.so
lib/transcode/export_net.so
lib/transcode/export_toolame.so
+%%WITH_OGG%%lib/transcode/export_ogg.so
+%%WITH_MJPEG%%lib/transcode/export_mjpeg.so
%%WITH_LIBDV%%lib/transcode/export_dvraw.so
%%WITH_LIBDV%%lib/transcode/export_dv.so
lib/transcode/export_mpeg.so
--- patch-pkg-plist ends here ---
--- patch-export:Makefile.in begins here ---
--- export/Makefile.in.orig Thu Sep 26 00:05:12 2002
+++ export/Makefile.in Thu Sep 26 00:05:50 2002
@@ -237,7 +237,7 @@
export_ffmpeg4_la_SOURCES = export_ffmpeg4.c aud_aux.c divx4_vbr.c
export_ffmpeg4_la_LDFLAGS = -no-undefined -module -avoid-version
-export_ffmpeg4_la_LIBADD = @LAME_LIBS@ -L../ffmpeg/libavcodec/ -lavcodec -L../avilib $(AC3_LIB) -lavi -lm
+export_ffmpeg4_la_LIBADD = @LAME_LIBS@ -L../ffmpeg/libavcodec/ -lavcodec -L../avilib -lavi -lm
export_divx4raw_la_SOURCES = export_divx4raw.c aud_aux.c divx4_vbr.c
export_divx4raw_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -285,7 +285,7 @@
export_ffmpeg_la_SOURCES = export_ffmpeg.c vid_aux.c aud_aux.c
export_ffmpeg_la_LDFLAGS = -no-undefined -module -avoid-version
-export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../ffmpeg/libavcodec/ -L../libvo -lvout $(AC3_LIB) -lavcodec -L../avilib -lavi -lm
+export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../ffmpeg/libavcodec/ -L../libvo -lvout -lavcodec -L../avilib -lavi -lm
export_mjpeg_la_SOURCES = export_mjpeg.c vid_aux.c aud_aux.c
export_mjpeg_la_LDFLAGS = -no-undefined -module -avoid-version
--- patch-export:Makefile.in ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209260748.g8Q7mH64083440>