[86933] trunk/dports/multimedia/transcode
devans at macports.org
devans at macports.org
Mon Nov 7 00:36:15 PST 2011
Revision: 86933
http://trac.macports.org/changeset/86933
Author: devans at macports.org
Date: 2011-11-07 00:36:13 -0800 (Mon, 07 Nov 2011)
Log Message:
-----------
transcode: update to final version 1.1.6, update homepage, master_sites, livecheck due to move from berlios.de.
Modified Paths:
--------------
trunk/dports/multimedia/transcode/Portfile
Added Paths:
-----------
trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff
trunk/dports/multimedia/transcode/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/multimedia/transcode/files/patch-configure.in.diff
trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff
Modified: trunk/dports/multimedia/transcode/Portfile
===================================================================
--- trunk/dports/multimedia/transcode/Portfile 2011-11-07 07:58:01 UTC (rev 86932)
+++ trunk/dports/multimedia/transcode/Portfile 2011-11-07 08:36:13 UTC (rev 86933)
@@ -4,8 +4,7 @@
PortSystem 1.0
name transcode
-version 1.1.5
-revision 3
+version 1.1.6
epoch 1
license GPL-2
categories multimedia
@@ -27,16 +26,14 @@
resizing algorithms, smoothing, sharpening, denoisifying, \
and cutting.
-homepage http://www.transcoding.org
+homepage https://bitbucket.org/france/transcode-tcforge/overview
-master_sites http://download.berlios.de/tcforge/ \
- http://download2.berlios.de/tcforge/
+master_sites https://bitbucket.org/france/transcode-tcforge/downloads/
use_bzip2 yes
-checksums md5 41ac6b1c0fe30f3aab286e771fc31b9e \
- sha1 48c36e06ca0cd1cdc1a9c6a241e231f896eefd26 \
- rmd160 fdc441190110a4ae4a54a4e2abd307db7f0111aa
+checksums md5 d5e062a6f0bdde60285ff1cc5cfeb0f5 \
+ sha1 e176622b2c2834b006cda3c368ab521407d375c4
depends_build port:pkgconfig
@@ -51,36 +48,29 @@
platforms darwin
-patchfiles patch-configure.in.diff \
- patch-transcode-ffmpeg.diff
+patchfiles patch-configure.diff \
+ patch-avilib-avidump.c.diff
-use_autoreconf yes
-autoreconf.args --force
-
-
configure.args --disable-mmx \
- --with-libavcodec-prefix=${prefix} \
- --with-libavformat-prefix=${prefix} \
--enable-libmpeg2 \
- --with-libmpeg2-prefix=${prefix} \
--enable-libmpeg2convert \
- --with-libmpeg2convert-prefix=${prefix} \
- --with-libdvdread-prefix=${prefix} \
- --with-libjpeg-prefix=${prefix} \
- --with-lame-prefix=${prefix}
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib
-use_parallel_build yes
+# Optional components
-# port:libmpeg2 is not universal
+#
+# libquicktime is not universal
+# mjpegtools is not universal
+#
+
universal_variant no
-# Optional components
-
variant mmx description {enable mmx optimizations} {
configure.args-delete --disable-mmx
}
-variant full requires a52dec faac freetype imagemagick libdv libogg libpostproc libquicktime libtheora libvorbis libxml2 lzo mjpegtools x264 xvid description {enable all optional components} {
+variant full requires a52dec faac freetype imagemagick libdv libogg libpostproc libquicktime libsdl libtheora libvorbis libxml2 lzo mjpegtools x264 xvid description {enable all optional components except deprecated and experimental} {
}
variant a52dec description {enable support for decoding ATSC A/52 streams} {
@@ -95,7 +85,7 @@
variant freetype description {enable support for the FreeType font engine} {
depends_lib-append port:freetype
- configure.args-append --enable-freetype2 --with-freetype2-prefix=${prefix}
+ configure.args-append --enable-freetype2
}
variant imagemagick description {enable support for the manipulation of still images} {
@@ -105,36 +95,36 @@
variant libdv description {enable support for the Digital Video format via libdv} {
depends_lib-append port:libdv
- configure.args-append --enable-libdv --with-libdv-prefix=${prefix}
+ configure.args-append --enable-libdv
}
variant libogg description {enable support for encoding and decoding ogg audio} {
depends_lib-append port:libogg
- configure.args-append --enable-ogg --with-ogg-prefix=${prefix}
+ configure.args-append --enable-ogg
}
variant libpostproc description {enable libpostproc support from ffmpeg} {
- configure.args-append --enable-libpostproc --with-libpostproc-prefix=${prefix}
+ configure.args-append --enable-libpostproc
}
variant libquicktime description {enable support for QuickTime video} {
depends_lib-append port:libquicktime
- configure.args-append --enable-libquicktime --with-libquicktime-prefix=${prefix}
+ configure.args-append --enable-libquicktime
}
variant libtheora description {enable support for the open video codec theora} {
depends_lib-append port:libtheora
- configure.args-append --enable-theora --with-theora-prefix=${prefix}
+ configure.args-append --enable-theora
}
variant libvorbis description {enable support for a fully open compressed audio format} {
depends_lib-append port:libvorbis
- configure.args-append --enable-vorbis --with-vorbis-prefix=${prefix}
+ configure.args-append --enable-vorbis
}
variant libxml2 description {enable support for the XML metalanguage} {
depends_lib-append port:libxml2
- configure.args-append --enable-libxml2 --with-libxml2-prefix=${prefix}
+ configure.args-append --enable-libxml2
}
variant lzo description {enable lossless data compression via lzo2} {
@@ -144,12 +134,12 @@
variant mjpegtools description {enable mjpegtools support} {
depends_lib-append port:mjpegtools
- configure.args-append --enable-mjpegtools --with-mjpegtools-prefix=${prefix}
+ configure.args-append --enable-mjpegtools
}
variant x264 description {enable support for encoding H264/AVC video} {
depends_lib-append port:x264
- configure.args-append --enable-x264 --with-x264-prefix=${prefix}
+ configure.args-append --enable-x264
}
variant xvid description {enable support for the open Xvid video codec} {
@@ -171,13 +161,15 @@
variant libsdl description {enable Simple DirectMedia Layer display support} {
depends_lib-append path:lib/pkgconfig/sdl.pc:libsdl
- configure.args-append --enable-sdl --with-sdl-prefix=${prefix}
+ configure.args-append --enable-sdl
}
variant no_x11 description {disable X11 options} {
depends_lib-delete port:xorg-libXv
depends_lib-delete port:xorg-libXaw
depends_lib-delete port:xpm
+ configure.args-delete --x-includes=${prefix}/include
+ configure.args-delete --x-libraries=${prefix}/lib
configure.args-append --without-x
}
@@ -186,5 +178,5 @@
}
livecheck.type regex
-livecheck.url http://download.berlios.de/tcforge/
+livecheck.url ${master_sites}
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
Added: trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff
===================================================================
--- trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff (rev 0)
+++ trunk/dports/multimedia/transcode/files/patch-avilib-avidump.c.diff 2011-11-07 08:36:13 UTC (rev 86933)
@@ -0,0 +1,10 @@
+--- avilib/avidump.c.orig 2011-11-06 21:57:56.000000000 -0800
++++ avilib/avidump.c 2011-11-06 22:01:16.000000000 -0800
+@@ -64,6 +64,7 @@
+ typedef uint16_t WORD;
+ typedef DWORD FOURCC; /* Type of FOUR Character Codes */
+ typedef uint8_t boolean;
++typedef unsigned long long loff_t;
+ #define TRUE 1
+ #define FALSE 0
+ #define BUFSIZE 4096
Added: trunk/dports/multimedia/transcode/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/transcode/files/patch-configure.diff (rev 0)
+++ trunk/dports/multimedia/transcode/files/patch-configure.diff 2011-11-07 08:36:13 UTC (rev 86933)
@@ -0,0 +1,13 @@
+--- configure.orig 2011-11-06 01:35:12.000000000 -0700
++++ configure 2011-11-06 23:04:37.000000000 -0800
+@@ -27483,7 +27483,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#undef __MACOSX__
++#undef __MACOS__
+ #include "SDL.h"
++#define main main
+ int main (int argc, char *argv[])
+ {
+ if ( (SDL_MAJOR_VERSION > $sdl_major_version) ||
Deleted: trunk/dports/multimedia/transcode/files/patch-configure.in.diff
===================================================================
--- trunk/dports/multimedia/transcode/files/patch-configure.in.diff 2011-11-07 07:58:01 UTC (rev 86932)
+++ trunk/dports/multimedia/transcode/files/patch-configure.in.diff 2011-11-07 08:36:13 UTC (rev 86933)
@@ -1,20 +0,0 @@
---- configure.in.orig 2009-10-31 09:39:02.000000000 -0700
-+++ configure.in 2010-09-17 18:44:45.000000000 -0700
-@@ -1139,7 +1139,9 @@
- sdl_minor_version=2
- sdl_micro_version=5
- save_CPPFLAGS="$CPPFLAGS"
-+ save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
-+ LIBS="$LIBS $SDL_LIBS"
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1169,6 +1171,7 @@
- [AC_MSG_RESULT([cross compiling; assumed OK...])
- have_sdl="yes"])
- CPPFLAGS="$save_CPPFLAGS"
-+ LIBS="$save_LIBS"
- fi
- TC_PKG_HAVE(sdl, SDL)
-
Deleted: trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff
===================================================================
--- trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff 2011-11-07 07:58:01 UTC (rev 86932)
+++ trunk/dports/multimedia/transcode/files/patch-transcode-ffmpeg.diff 2011-11-07 08:36:13 UTC (rev 86933)
@@ -1,102 +0,0 @@
-diff -up export/export_ffmpeg.c.ffmpeg export/export_ffmpeg.c
---- export/export_ffmpeg.c.ffmpeg 2009-02-21 22:01:57.000000000 +0100
-+++ export/export_ffmpeg.c 2011-09-03 12:39:13.000000000 +0200
-@@ -643,8 +643,10 @@ MOD_init
-
- lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
- lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
-+#if FF_API_MB_Q
- lavc_venc_context->mb_qmin = lavc_param_mb_qmin;
- lavc_venc_context->mb_qmax = lavc_param_mb_qmax;
-+#endif
- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
- lavc_venc_context->max_qdiff = lavc_param_vqdiff;
-diff -up filter/filter_resample.c.ffmpeg filter/filter_resample.c
---- filter/filter_resample.c.ffmpeg 2009-02-21 22:01:57.000000000 +0100
-+++ filter/filter_resample.c 2011-09-03 13:28:13.000000000 +0200
-@@ -110,8 +110,15 @@ static int resample_configure(TCModuleIn
- goto abort;
- }
-
-+#if FF_API_AUDIO_OLD
- pd->resample_ctx = audio_resample_init(vob->a_chan, vob->a_chan,
- vob->mp3frequency, vob->a_rate);
-+#else
-+ pd->resample_ctx = av_audio_resample_init(vob->a_chan, vob->a_chan,
-+ vob->mp3frequency, vob->a_rate,
-+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
-+ 16, 10, 0, 0.8);
-+#endif
- if (pd->resample_ctx == NULL) {
- tc_log_error(MOD_NAME, "can't get a resample context");
- goto abort;
-diff -up import/decode_lavc.c.ffmpeg import/decode_lavc.c
---- import/decode_lavc.c.ffmpeg 2009-03-28 09:39:08.000000000 +0100
-+++ import/decode_lavc.c 2011-09-03 12:39:13.000000000 +0200
-@@ -261,8 +261,17 @@ void decode_lavc(decode_t *decode)
-
- //tc_log_msg(__FILE__, "SIZE: (%d) MP4(%d) blen(%d) BUF(%d) read(%ld)", len, mp4_size, buf_len, READ_BUFFER_SIZE, bytes_read);
- do {
-+#if FF_API_VIDEO_OLD
- len = avcodec_decode_video(lavc_dec_context, &picture,
- &got_picture, buffer+buf_len, mp4_size-buf_len);
-+#else
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = buffer+buf_len;
-+ avpkt.size = mp4_size-buf_len;
-+ len = avcodec_decode_video2(lavc_dec_context, &picture,
-+ &got_picture, &avpkt);
-+#endif
-
- if (len < 0) {
- tc_log_error(__FILE__, "frame decoding failed");
-diff -up import/import_ffmpeg.c.ffmpeg import/import_ffmpeg.c
---- import/import_ffmpeg.c.ffmpeg 2009-02-21 22:01:57.000000000 +0100
-+++ import/import_ffmpeg.c 2011-09-03 14:09:41.000000000 +0200
-@@ -543,8 +543,17 @@ MOD_decode {
- retry:
- do {
- TC_LOCK_LIBAVCODEC;
-+#if FF_API_VIDEO_OLD
- len = avcodec_decode_video(lavc_dec_context, &picture,
- &got_picture, buffer, bytes_read);
-+#else
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = buffer;
-+ avpkt.size = bytes_read;
-+ len = avcodec_decode_video2(lavc_dec_context, &picture,
-+ &got_picture, &avpkt);
-+#endif
- TC_UNLOCK_LIBAVCODEC;
-
- if (len < 0) {
-diff -up import/probe_ffmpeg.c.ffmpeg import/probe_ffmpeg.c
---- import/probe_ffmpeg.c.ffmpeg 2009-03-28 09:39:08.000000000 +0100
-+++ import/probe_ffmpeg.c 2011-09-03 12:39:13.000000000 +0200
-@@ -47,7 +47,11 @@ static void translate_info(const AVForma
- for (i = 0; i < ctx->nb_streams; i++) {
- st = ctx->streams[i];
-
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
-+#else
-+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-+#endif
- info->bitrate = st->codec->bit_rate / 1000;
- info->width = st->codec->width;
- info->height = st->codec->height;
-@@ -65,7 +69,11 @@ static void translate_info(const AVForma
- for (i = 0; i < ctx->nb_streams; i++) {
- st = ctx->streams[i];
-
-+#if LIBAVCODEC_VERSION_MAJOR < 53
- if (st->codec->codec_type == CODEC_TYPE_AUDIO
-+#else
-+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO
-+#endif
- && j < TC_MAX_AUD_TRACKS) {
- info->track[j].format = 0x1; /* known wrong */
- info->track[j].chan = st->codec->channels;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111107/e4fced10/attachment.html>
More information about the macports-changes
mailing list