From 3ac42bc6cdbe9f1b00071b5fd663165fc612a9bf Mon Sep 17 00:00:00 2001 From: Minto van der Sluis Date: Fri, 21 Sep 2007 09:40:41 +0200 Subject: [PATCH] Updated transcode (1.0.2 -> 1.0.4) - Used updated avifile now, but required a patch to do so. --- multimedia/transcode/ffmpeg-version.patch | 38 ----- .../transcode/hotfix-filter_compare.patch | 160 ------------------ multimedia/transcode/hotfix-filter_logo.patch | 48 ------ .../transcode/hotfix-v4l-detection.patch | 27 --- multimedia/transcode/transcode.conf | 11 +- multimedia/transcode/transcode.desc | 6 +- 6 files changed, 8 insertions(+), 282 deletions(-) delete mode 100644 multimedia/transcode/ffmpeg-version.patch delete mode 100644 multimedia/transcode/hotfix-filter_compare.patch delete mode 100644 multimedia/transcode/hotfix-filter_logo.patch delete mode 100644 multimedia/transcode/hotfix-v4l-detection.patch diff --git a/multimedia/transcode/ffmpeg-version.patch b/multimedia/transcode/ffmpeg-version.patch deleted file mode 100644 index f3d331e2a..000000000 --- a/multimedia/transcode/ffmpeg-version.patch +++ /dev/null @@ -1,38 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../transcode/ffmpeg-version.patch -# Copyright (C) 2006 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -=================================================================== -RCS file: /cvstc/transcode/configure.in,v -retrieving revision 1.181 -retrieving revision 1.183 -diff -u -r1.181 -r1.183 ---- transcode/configure.in 2006/06/07 00:52:26 1.181 -+++ transcode/configure.in 2006/07/06 09:23:49 1.183 -@@ -558,7 +558,13 @@ - printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after 20040703"); - return(1); - } -+ -+ /* 3344640 == ((51<<16)+(9<<8)+0) == 51.9.0 */ -+#if LIBAVCODEC_BUILD >= 3344640 -+ printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION)); -+#else - printf("VER=%s\n", FFMPEG_VERSION); -+#endif /* LIBAVCODEC_BUILD >= 51.9.0 check */ - printf("BUILD=%d\n", LIBAVCODEC_BUILD); - return(0); - } diff --git a/multimedia/transcode/hotfix-filter_compare.patch b/multimedia/transcode/hotfix-filter_compare.patch deleted file mode 100644 index bbc364793..000000000 --- a/multimedia/transcode/hotfix-filter_compare.patch +++ /dev/null @@ -1,160 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../transcode/hotfix-filter_compare.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- transcode-1.0.2/filter/filter_compare.c 2005-07-04 09:09:32.000000000 +0200 -+++ transcode/filter/filter_compare.c 2006-10-08 00:24:05.000000000 +0200 -@@ -23,7 +23,7 @@ - */ - - #define MOD_NAME "filter_compare.so" --#define MOD_VERSION "v0.1.2 (2003-08-29)" -+#define MOD_VERSION "v0.1.3 (2006-01-24)" - #define MOD_CAP "compare with other image to find a pattern" - #define MOD_AUTHOR "Antonio Beamud" - -@@ -97,6 +97,8 @@ - - } - -+#define RESULTS_FILE "/tmp/compare.dat" -+#define PATTERN_FILE "/dev/null" - - int tc_filter(vframe_list_t *ptr, char *options) - { -@@ -114,9 +116,9 @@ - optstr_filter_desc(options, MOD_NAME, MOD_CAP, MOD_VERSION, - MOD_AUTHOR, "VRYMO", "1"); - -- snprintf(buf, 128, "/dev/null"); -+- snprintf(buf, 128, PATTERN_FILE); - optstr_param(options, "pattern", "Pattern image file path", "%s", buf); -- snprintf(buf, 128, "results.dat"); -+ snprintf(buf, 128, RESULTS_FILE); - optstr_param(options, "results", "Results file path" , "%s", buf); - snprintf(buf, 128, "%f", compare[instance]->delta); - optstr_param(options, "delta", "Delta error", "%f",buf,"0.0", "100.0"); -@@ -132,16 +134,20 @@ - - if(ptr->tag & TC_FILTER_INIT) - { -- -+ char pattern_name[PATH_MAX]; -+ char results_name[PATH_MAX]; - unsigned int t,r,index; - pixelsMask *temp; - -- if((compare[instance] = (compareData *)malloc(sizeof(compareData))) == NULL) -+ /* defaults */ -+ strlcpy(results_name, RESULTS_FILE, sizeof(results_name)); -+ strlcpy(pattern_name, PATTERN_FILE, sizeof(pattern_name)); -+ -+ if((compare[instance] = malloc(sizeof(compareData))) == NULL) - return (-1); - - if((compare[instance]->vob = tc_get_vob())==NULL) return(-1); - -- - compare[instance]->delta=DELTA_COLOR; - compare[instance]->step=1; - compare[instance]->width=0; -@@ -154,13 +160,13 @@ - compare[instance]->height = compare[instance]->vob->ex_v_height; - - if (options != NULL) { -- char pattern_name[PATH_MAX]; -- char results_name[PATH_MAX]; -- memset(pattern_name,0,PATH_MAX); -- memset(results_name,0,PATH_MAX); -- - if(verbose) printf("[%s] options=%s\n", MOD_NAME, options); - -+ if (optstr_lookup (options, "help")) { -+ help_optstr(); -+ return(0); -+ } -+ - optstr_get(options, "pattern", "%[^:]", &pattern_name); - optstr_get(options, "results", "%[^:]", &results_name); - optstr_get(options, "delta", "%f", &compare[instance]->delta); -@@ -172,47 +178,45 @@ - printf(" delta = %f\n", compare[instance]->delta); - } - -- if (strlen(results_name) == 0) { -- // Ponemos el nombre del fichero al original con extension dat -- strlcpy(results_name, "/tmp/compare.dat", sizeof(results_name)); -- -+ if (!pattern_name || !strlen(pattern_name)) { -+ /* restore default */ -+ fprintf(stderr, "[%s] missing image file, using fake " -+ "source\n", MOD_NAME); -+ strlcpy(pattern_name, PATTERN_FILE, sizeof(pattern_name)); - } -- if (!(compare[instance]->results = fopen(results_name, "w"))) -- { -+ if (!results_name || !strlen(results_name)) { -+ /* restore default */ -+ fprintf(stderr, "[%s] using default results file '%s'\n", -+ MOD_NAME, RESULTS_FILE); -+ strlcpy(results_name, RESULTS_FILE, sizeof(results_name)); -+ } -+ } -+ -+ if (!(compare[instance]->results = fopen(results_name, "w"))) { - perror("could not open file for writing"); -+ return(-1); - } - - InitializeMagick(""); - if (verbose > 1) printf("[%s] Magick Initialized successfully\n", MOD_NAME); - - GetExceptionInfo(&exception_info); -- image_info = CloneImageInfo ((ImageInfo *) NULL); -+ image_info = CloneImageInfo(NULL); - strlcpy(image_info->filename, pattern_name, MaxTextExtent); - if (verbose > 1) - printf("Trying to open image\n"); -- orig = ReadImage(image_info, -- &exception_info); -+ orig = ReadImage(image_info, &exception_info); - -- if (orig == (Image *) NULL) { -+ if (!orig) { - MagickWarning(exception_info.severity, - exception_info.reason, - exception_info.description); -- strlcpy(pattern_name, "/dev/null", sizeof(pattern_name)); -- }else{ -+ fprintf(stderr, "[%s] Can't open image\n", MOD_NAME); -+ return(-1); -+ } else { - if (verbose > 1) - printf("[%s] Image loaded successfully\n", MOD_NAME); - } -- } -- -- else{ -- perror("Not image provided"); -- } -- -- if (options != NULL) -- if (optstr_lookup (options, "help")) { -- help_optstr(); -- } -- - - fprintf(compare[instance]->results,"#fps:%f\n",compare[instance]->vob->fps); - diff --git a/multimedia/transcode/hotfix-filter_logo.patch b/multimedia/transcode/hotfix-filter_logo.patch deleted file mode 100644 index f3d6d9104..000000000 --- a/multimedia/transcode/hotfix-filter_logo.patch +++ /dev/null @@ -1,48 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../transcode/hotfix-filter_logo.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- transcode-1.0.2/filter/filter_logo.c 2005-07-04 09:09:32.000000000 +0200 -+++ transcode/filter/filter_logo.c 2006-10-08 00:22:48.000000000 +0200 -@@ -146,6 +146,7 @@ - } - - if(ptr->tag & TC_FILTER_INIT) { -+ int dry_run = 0; - - if((vob = tc_get_vob())==NULL) return(-1); - -@@ -181,8 +182,10 @@ - if (optstr_get (options, "rgbswap", "") >= 0) mfd->rgbswap=!mfd->rgbswap; - if (optstr_get (options, "grayout", "") >= 0) mfd->grayout=!mfd->grayout; - -- if (optstr_get (options, "help", "") >= 0) -+ if (optstr_get (options, "help", "") >= 0) { - help_optstr(); -+ dry_run = 1; -+ } - } - - if (verbose > 1) { -@@ -195,6 +198,9 @@ - printf (" ignoredelay = %d\n", mfd->ignoredelay); - printf (" rgbswap = %d\n", mfd->rgbswap); - } -+ if (dry_run) { -+ return(0); -+ } - - InitializeMagick(""); - diff --git a/multimedia/transcode/hotfix-v4l-detection.patch b/multimedia/transcode/hotfix-v4l-detection.patch deleted file mode 100644 index 78c8e98ce..000000000 --- a/multimedia/transcode/hotfix-v4l-detection.patch +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../transcode/hotfix-v4l-detection.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- transcode-1.0.2/acinclude.m4 2005-07-04 08:58:50.000000000 +0200 -+++ transcode/acinclude.m4 2006-10-08 00:39:22.000000000 +0200 -@@ -92,7 +92,7 @@ - ], [AC_DEFINE([HAVE_STRUCT_V4L2_BUFFER], 1, - [define if your videodev2 header has struct v4l2_buffer]) - AC_MSG_RESULT([yes])], -- [v4l2=no AC_MSG_RESULT([no])]) -+ [AC_MSG_RESULT([no])]) - fi - - if test x"$v4l" = x"yes" -o x"$v4l2" = x"yes" ; then diff --git a/multimedia/transcode/transcode.conf b/multimedia/transcode/transcode.conf index fa8962051..738b75cda 100644 --- a/multimedia/transcode/transcode.conf +++ b/multimedia/transcode/transcode.conf @@ -13,16 +13,15 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -# newest ffmpeg does not define ffmpeg_version anymore, patch configure.in -# and use libavcodec_version instead -autogen=1 +# required libraries. +pkgprefix -t ffmpeg +pkgprefix -t libmpeg2 +var_append confopt " " "--enable-libavcodec --enable-libmpeg2" var_append confopt " " "--enable-netstream" var_append confopt " " "--enable-v4l" var_append confopt " " "--disable-iconv" -pkginstalled ffmpeg && var_append confopt " " "--enable-libavcodec" -pkginstalled libmpeg2 && var_append confopt " " "--enable-libmpeg2" pkginstalled avifile && var_append confopt " " "--enable-avifile" pkginstalled libdvdread && var_append confopt " " "--enable-libdvdread" pkginstalled lame && var_append confopt " " "--enable-lame" @@ -35,6 +34,6 @@ pkginstalled libdv && var_append confopt " " "--enable-libdv" pkginstalled libquicktime && var_append confopt " " "--enable-libquicktime" pkginstalled libxml && var_append confopt " " "--enable-libxml2" pkginstalled freetype && var_append confopt " " "--enable-freetype2" -pkginstalled libsdl && var_append confopt " " "--enable-sdl" pkginstalled gtk+12 && var_append confopt " " "--enable-gtk" +pkginstalled libsdl && var_append confopt " " "--enable-sdl" pkginstalled imagemagick && var_append confopt " " "--enable-imagemagick" diff --git a/multimedia/transcode/transcode.desc b/multimedia/transcode/transcode.desc index 756cc7f02..b90c811c4 100644 --- a/multimedia/transcode/transcode.desc +++ b/multimedia/transcode/transcode.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../transcode/transcode.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -37,7 +37,7 @@ [L] GPL [S] Beta -[V] 1.0.2 +[V] 1.0.4 [P] X -----5---9 301.000 -[D] 403933966 transcode-1.0.2.tar.gz http://www.kraymer.mynetcologne.de/ +[D] 18669112 transcode-1.0.4.tar.bz2 http://fromani.exit1.org/