From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 11 10:20:13 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A13F16A4CE for ; Wed, 11 May 2005 10:20:13 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C043343D70 for ; Wed, 11 May 2005 10:20:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4BAKCQs050634 for ; Wed, 11 May 2005 10:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4BAKCg1050633; Wed, 11 May 2005 10:20:12 GMT (envelope-from gnats) Resent-Date: Wed, 11 May 2005 10:20:12 GMT Resent-Message-Id: <200505111020.j4BAKCg1050633@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hendrik Scholz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41E6116A4D0 for ; Wed, 11 May 2005 10:12:37 +0000 (GMT) Received: from mail.wormulon.net (plant.wormulon.net [81.169.153.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48A3B43D6D for ; Wed, 11 May 2005 10:12:36 +0000 (GMT) (envelope-from hscholz@mail.wormulon.net) Received: from localhost (localhost [127.0.0.1]) by mail.wormulon.net (Postfix) with ESMTP id 2B48E4B50C; Wed, 11 May 2005 12:12:35 +0200 (CEST) Received: from mail.wormulon.net ([127.0.0.1]) by localhost (plant.wormulon.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 36313-02; Wed, 11 May 2005 12:12:29 +0200 (CEST) Received: by mail.wormulon.net (Postfix, from userid 1001) id 456374B53D; Wed, 11 May 2005 12:12:29 +0200 (CEST) Message-Id: <20050511101229.456374B53D@mail.wormulon.net> Date: Wed, 11 May 2005 12:12:29 +0200 (CEST) From: Hendrik Scholz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Hendrik Scholz Subject: ports/80884: maintainer-update: multimedia/transcode 1.0.0beta2 to 1.0.0beta3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Hendrik Scholz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2005 10:20:13 -0000 >Number: 80884 >Category: ports >Synopsis: maintainer-update: multimedia/transcode 1.0.0beta2 to 1.0.0beta3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 11 10:20:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Hendrik Scholz >Release: FreeBSD 5.2.1-RELEASE-p9 i386 >Organization: >Environment: System: FreeBSD plant.wormulon.net 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #0: Fri Aug 13 11:32:22 CEST 2004 hscholz@h2012.ka.strato.de:/usr/src/sys/i386/compile/PLANT i386 FreeBSD zoidberg.freenet-ag.de 6.0-CURRENT FreeBSD 6.0-CURRENT #2: Thu Dec 9 14:47:28 CET 2004 hscholz@zoidberg.freenet-ag.de:/usr/src/sys/i386/compile/ZOIDBERG i386 >Description: Maintainer update of transcode. Although this seems minor based on the version it's a rather large update. Changes: - add mjpegtools support to provide DVD related functions again - chase liba52 support and add a52 as default encoder - fix jpegmmx support - add gtk/sdl preview support - add files/patch-configure Shar file: http://dump.wormulon.net/patches/transcode-1.0.0beta3.shar >How-To-Repeat: >Fix: --- transcode-1.0.0beta2-to-3.diff begins here --- Index: transcode/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/transcode/Makefile,v retrieving revision 1.57 diff -u -u -r1.57 Makefile --- transcode/Makefile 4 May 2005 11:44:31 -0000 1.57 +++ transcode/Makefile 11 May 2005 10:02:34 -0000 @@ -6,8 +6,7 @@ # PORTNAME= transcode -DISTVERSION= 1.0.0beta2 -PORTREVISION= 1 +DISTVERSION= 1.0.0beta3 CATEGORIES= multimedia MASTER_SITES= http://dl.fkb.wormulon.net/transcode/ \ http://dl.kel.wormulon.net/transcode/ \ @@ -118,6 +117,10 @@ WITH_JPEGMMX= yes .endif +.if exists(${LOCALBASE}/lib/liblavjpeg.so) +WITH_MJPEG= yes +.endif + .if defined(WITH_FREETYPE) LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --with-ft-prefix=${LOCALBASE} --enable-freetype2 @@ -163,12 +166,22 @@ .if defined(WITH_JPEGMMX) LIB_DEPENDS+= jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx - +CONFIGURE_ARGS+= --enable-libjpegmmx PLIST_SUB+= WITH_JPEGMMX="" .else +CONFIGURE_ARGS+= --enable-libjpegmmx=no PLIST_SUB+= WITH_JPEGMMX="@comment " .endif +.if defined(WITH_MJPEG) +LIB_DEPENDS+= lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools +CONFIGURE_ARGS+= --enable-mjpegtools +PLIST_SUB+= WITH_MJPEG="" +.else +CONFIGURE_ARGS+= --enable-mjpegtools=no +PLIST_SUB+= WITH_MJPEG="@comment " +.endif + .if defined(WITH_AVIFILE) LIB_DEPENDS+= aviplay:${PORTSDIR}/multimedia/avifile PLIST_SUB+= WITH_AVIFILE="" @@ -181,8 +194,10 @@ .if defined(WITH_SDL) USE_SDL= sdl WITH_LIBDV= yes +CONFIGURE_ARGS+= --enable-sdl --with-sdl-prefix=${LOCALBASE} PLIST_SUB+= WITH_SDL="" .else +CONFIGURE_ARGS+= --enable-sdl=no PLIST_SUB+= WITH_SDL="@comment " .endif @@ -232,13 +247,17 @@ PLIST_SUB+= WITH_XVID="@comment " .endif +.if defined(WITH_LIBA52_DEFAULT) +WITH_LIBA52= yes +CONFIGURE_ARGS+= --enable-a52-default-decoder +.endif + .if defined(WITH_LIBA52) LIB_DEPENDS+= a52.0:${PORTSDIR}/audio/liba52 -CONFIGURE_ARGS+= --enable-liba52=yes +CONFIGURE_ARGS+= --enable-a52 PLIST_SUB+= WITH_LIBA52="" .else -CONFIGURE_ARGS+= --with-a52=no \ - --enable-liba52=no +CONFIGURE_ARGS+= --with-a52=no PLIST_SUB+= WITH_LIBA52="@comment " .endif @@ -266,6 +285,14 @@ .else .endif +.if defined(WITH_GTK) +CONFIGURE_ARGS+= --enable-gtk +PLIST_SUB+= WITH_GTK="" +.else +CONFIGURE_ARGS+= --enable-gtk=no +PLIST_SUB+= WITH_GTK="@comment " +.endif + pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} @@ -291,6 +318,10 @@ @${ECHO_MSG} @${ECHO_MSG} "You can enable JPEG with MMX by defining WITH_JPEGMMX." .endif +.if !defined(WITH_MJPEG) + @${ECHO_MSG} + @${ECHO_MSG} "You can enable MJPEG portions by defining WITH_JPEGMMX." +.endif .if !defined(WITH_IMAGEMAGICK) @${ECHO_MSG} @${ECHO_MSG} "You can enable ImageMagick-dependent modules by defining WITH_IMAGEMAGICK." @@ -322,6 +353,12 @@ @${ECHO_MSG} "You will probably want to enable this, if you plan to" @${ECHO_MSG} "rip DVDs." .endif +.if !defined(WIH_LIBA52_DEFAULT) + @${ECHO_MSG} + @${ECHO_MSG} "You can use liba52 as default audio encoder by defining WITH_LIBA52_DEFAULT." + @${ECHO_MSG} "This implies WITH_LIBA52." + @${ECHO_MSG} +.endif .if !defined(WITH_AVIFILE) @${ECHO_MSG} @${ECHO_MSG} "You can enable avifile-dependent modules by defining WITH_AVIFILE." @@ -360,6 +397,7 @@ .endif @${REINPLACE_CMD} -E -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c @${REINPLACE_CMD} -E -e 's|&5 -echo $ECHO_N "checking for a52_init in -la52... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for a52_init in -la52 -L/usr/local/lib -ldjbfft -lm" >&5 +echo $ECHO_N "checking for a52_init in -la52 -L/usr/local/lib -ldjbfft -lm... $ECHO_C" >&6 if test "${ac_cv_lib_a52_a52_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-la52 $A52_EXTRA_LIBS $LIBS" +LIBS="-la52 -L/usr/local/lib -ldjbfft -lm $A52_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -37824,7 +37824,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_a52_a52_init" >&5 echo "${ECHO_T}$ac_cv_lib_a52_a52_init" >&6 if test $ac_cv_lib_a52_a52_init = yes; then - A52_LIBS="$a52_ll -la52 $A52_EXTRA_LIBS" + A52_LIBS="$a52_ll -la52 -L/usr/local/lib -ldjbfft -lm $A52_EXTRA_LIBS" else tc_pkg_err="yes" @@ -40561,14 +40561,14 @@ echo "${ECHO_T}$pkg_config_sdl" >&6 - if test x"sdl-config" != x"no" ; then + if test x"sdl11-config" != x"no" ; then if test x"$w_sdl_p" != x"" ; then - if test -x $w_sdl_p/bin/sdl-config ; then - sdl_config="$w_sdl_p/bin/sdl-config" + if test -x $w_sdl_p/bin/sdl11-config ; then + sdl_config="$w_sdl_p/bin/sdl11-config" fi fi - # Extract the first word of "sdl-config", so it can be a program name with args. -set dummy sdl-config; ac_word=$2 + # Extract the first word of "sdl11-config", so it can be a program name with args. +set dummy sdl11-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_sdl_config+set}" = set; then @@ -40856,7 +40856,7 @@ for l in $sdl_ll ; do case $l in -L*) lpaths="$lpaths $l" ;; - -l*) test x"$l" != x"-lSDL" && xlibs="$xlibs $l" ;; + -l*) test x"$l" != x"-lSDL-1.1" && xlibs="$xlibs $l" ;; *) xlf="$xlf $l" ;; esac done @@ -40872,13 +40872,13 @@ if test x"SDL" != x"none" ; then save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $sdl_ll" - echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5 -echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5 +echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6 if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lSDL $SDL_EXTRA_LIBS $LIBS" +LIBS="-lSDL-1.1 $SDL_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -40937,7 +40937,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5 echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6 if test $ac_cv_lib_SDL_SDL_Init = yes; then - SDL_LIBS="$sdl_ll -lSDL $SDL_EXTRA_LIBS" + SDL_LIBS="$sdl_ll -lSDL-1.1 $SDL_EXTRA_LIBS" else tc_pkg_err="yes" @@ -41429,7 +41429,7 @@ for l in $gtk_ll ; do case $l in -L*) lpaths="$lpaths $l" ;; - -l*) test x"$l" != x"-lgtk" && xlibs="$xlibs $l" ;; + -l*) test x"$l" != x"-lgtk12" && xlibs="$xlibs $l" ;; *) xlf="$xlf $l" ;; esac done @@ -41445,13 +41445,13 @@ if test x"gtk" != x"none" ; then save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $gtk_ll" - echo "$as_me:$LINENO: checking for gtk_init in -lgtk" >&5 -echo $ECHO_N "checking for gtk_init in -lgtk... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for gtk_init in -lgtk12" >&5 +echo $ECHO_N "checking for gtk_init in -lgtk12... $ECHO_C" >&6 if test "${ac_cv_lib_gtk_gtk_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgtk $GTK_EXTRA_LIBS $LIBS" +LIBS="-lgtk12 $GTK_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41510,7 +41510,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_gtk_gtk_init" >&5 echo "${ECHO_T}$ac_cv_lib_gtk_gtk_init" >&6 if test $ac_cv_lib_gtk_gtk_init = yes; then - GTK_LIBS="$gtk_ll -lgtk $GTK_EXTRA_LIBS" + GTK_LIBS="$gtk_ll -lgtk12 $GTK_EXTRA_LIBS" else tc_pkg_err="yes" --- transcode-1.0.0beta2-to-3.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: