Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK change 9186 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK change 9186 to grimoire.svk
  • Date: Sat, 10 Jun 2006 09:05:22 -0500

Group: defaults
Subject: r9186 - in test: . video/transcode

Author: arwed
Date: Sat Jun 10 09:05:21 2006
New Revision: 9186

Added:
test/video/transcode/03_imagemagick.dpatch
Modified:
test/ (props changed)
test/video/transcode/DETAILS
test/video/transcode/HISTORY
test/video/transcode/PRE_BUILD

Log:
r9228@Otherland: arwed | 1970-01-01 01:00:00 +0200
transcode: apply patch to make imagemagick filters not hang, bug 12625


Added: test/video/transcode/03_imagemagick.dpatch
==============================================================================
--- (empty file)
+++ test/video/transcode/03_imagemagick.dpatch Sat Jun 10 09:05:21 2006
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_configure.dpatch by Christian Marillat <marillat AT debian.org>
+##
+## All lines beginning with ## DP:' are a description of the patch.
+## DP: Fix configure.
+
+@DPATCH@
+
+--- transcode-1.0.1.orig/filter/filter_compare.c
++++ transcode-1.0.1/filter/filter_compare.c
+@@ -180,6 +180,7 @@
+ if (!(compare[instance]->results =
fopen(results_name, "w")))
+ {
+ perror("could not open file for writing");
++ return (-1);
+ }
+
+ InitializeMagick("");
+--- transcode-1.0.1.orig/filter/filter_logo.c 2005-10-21 22:18:49.000000000
+0200
++++ transcode-1.0.1/filter/filter_logo.c 2005-10-21 22:19:52.000000000
+0200
+@@ -183,17 +183,18 @@
+
+ if (optstr_get (options, "help", "") >= 0)
+ help_optstr();
+- }
+
+- if (verbose > 1) {
+- printf (" Logo renderer Settings:\n");
+- printf (" file = %s\n", mfd->file);
+- printf (" posdef = %d\n", mfd->pos);
+- printf (" pos = %dx%d\n", mfd->posx, mfd->posy);
+- printf (" range = %u-%u\n", mfd->start, mfd->end);
+- printf (" flip = %d\n", mfd->flip);
+- printf (" ignoredelay = %d\n", mfd->ignoredelay);
+- printf (" rgbswap = %d\n", mfd->rgbswap);
++ if (verbose > 1) {
++ printf (" Logo renderer Settings:\n");
++ printf (" file = %s\n", mfd->file);
++ printf (" posdef = %d\n", mfd->pos);
++ printf (" pos = %dx%d\n", mfd->posx, mfd->posy);
++ printf (" range = %u-%u\n", mfd->start, mfd->end);
++ printf (" flip = %d\n", mfd->flip);
++ printf (" ignoredelay = %d\n", mfd->ignoredelay);
++ printf (" rgbswap = %d\n", mfd->rgbswap);
++ }
++ return (-1);
+ }
+
+ InitializeMagick("");

Modified: test/video/transcode/DETAILS
==============================================================================
--- test/video/transcode/DETAILS (original)
+++ test/video/transcode/DETAILS Sat Jun 10 09:05:21 2006
@@ -1,5 +1,6 @@
SPELL=transcode
VERSION=1.0.2
+ PATCHLEVEL=1

SOURCE_HASH=sha512:79424ae83ad244553c9d283bd9d8f57535e3bf2b36919f861a2cea9c00d31d8d46e6a00cab5fdc24ecaf2001af5338babd51fac30f18dbdc13dfb44c6ff45834
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -11,5 +12,11 @@
KEYWORDS="video"
SHORT="Console video-stream processing tool"
cat << EOF
-Transcode is a text console video-stream processing tool. It supports
elementary video and audio frame transformations. Some example modules are
included to enable import of MPEG-1/2, Digital Video, and other formats. It
also includes export modules for writing to AVI files with DivX, OpenDivX,
XviD, Digital Video or other codecs. Direct DVD transcoding is also
supported. A set of tools is available to extract and decode the sources into
raw video/audio streams for import and to enable post-processing of AVI files.
+Transcode is a text console video-stream processing tool. It supports
+elementary video and audio frame transformations. Some example modules are
+included to enable import of MPEG-1/2, Digital Video, and other formats. It
+also includes export modules for writing to AVI files with DivX, OpenDivX,
+XviD, Digital Video or other codecs. Direct DVD transcoding is also
supported.
+A set of tools is available to extract and decode the sources into raw
+video/audio streams for import and to enable post-processing of AVI files.
EOF

Modified: test/video/transcode/HISTORY
==============================================================================
--- test/video/transcode/HISTORY (original)
+++ test/video/transcode/HISTORY Sat Jun 10 09:05:21 2006
@@ -1,3 +1,8 @@
+2006-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, 03_imagemagick.dpatch:
+ apply patch from bug #12625 to make the imagemagick filters not hang
+ * DETAILS: set PATCHLEVEL=1
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


Modified: test/video/transcode/PRE_BUILD
==============================================================================
--- test/video/transcode/PRE_BUILD (original)
+++ test/video/transcode/PRE_BUILD Sat Jun 10 09:05:21 2006
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch
+patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/03_imagemagick.dpatch



  • [SM-Commit] SVK change 9186 to grimoire.svk, Arwed von Merkatz, 06/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page