Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (09df74bc78db36fb5f3eb5bcad8a6774fe0b29be)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (09df74bc78db36fb5f3eb5bcad8a6774fe0b29be)
  • Date: Fri, 20 Apr 2007 12:44:16 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video/transcode/01_configure.dpatch | 69 -----------
video/transcode/03_imagemagick.dpatch | 49 --------
video/transcode/DETAILS | 11 -
video/transcode/HISTORY | 6 +
video/transcode/HISTORY~ | 163
++++++++++++++++++++++++++++
video/transcode/PRE_BUILD | 3
video/transcode/ffmpeg-api.patch | 13 --
video/transcode/transcode-1.0.3.tar.bz2.sig |binary
8 files changed, 174 insertions(+), 140 deletions(-)

New commits:
commit 09df74bc78db36fb5f3eb5bcad8a6774fe0b29be
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

transcode: updated to 1.0.3

diff --git a/video/transcode/01_configure.dpatch
b/video/transcode/01_configure.dpatch
deleted file mode 100644
index 39c53e7..0000000
--- a/video/transcode/01_configure.dpatch
+++ /dev/null
@@ -1,69 +0,0 @@
---- transcode-1.0.2.old/configure 2005-07-04 09:15:58.000000000 +0200
-+++ transcode-1.0.2/configure 2005-11-28 19:51:10.000000000 +0100
-@@ -27663,7 +27663,7 @@
- echo "$as_me:$LINENO: checking for pkgconfig support for libavcodec" >&5
- echo $ECHO_N "checking for pkgconfig support for libavcodec... $ECHO_C" >&6
- if test x"$PKG_CONFIG" != x"no" ; then
-- if $PKG_CONFIG FFMpeg --exists ; then
-+ if $PKG_CONFIG libavcodec --exists ; then
- pkg_config_libavcodec="yes"
- fi
- fi
-@@ -27731,7 +27731,7 @@
- echo "${ECHO_T}user" >&6
- else
- if test x"$pkg_config_libavcodec" != x"no" ; then
-- libavcodec_ii="`$PKG_CONFIG FFMpeg --cflags`"
-+ libavcodec_ii="`$PKG_CONFIG libavcodec --cflags`"
- echo "$as_me:$LINENO: result: pkg-config" >&5
- echo "${ECHO_T}pkg-config" >&6
- else
-@@ -27941,7 +27941,7 @@
- echo "${ECHO_T}user" >&6
- else
- if test x"$pkg_config_libavcodec" != x"no" ; then
-- libavcodec_ll="`$PKG_CONFIG FFMpeg --libs`"
-+ libavcodec_ll="`$PKG_CONFIG libavcodec --libs`"
- echo "$as_me:$LINENO: result: pkg-config" >&5
- echo "${ECHO_T}pkg-config" >&6
- else
-@@ -28107,7 +28107,11 @@
- printf("install ffmpeg 0.4.9-pre1 or newer, or a cvs version after
20040703");
- return(1);
- }
-- printf("VER=%s\n", FFMPEG_VERSION);
-+ #if LIBAVCODEC_BUILD >= 3344640
-+ printf("VER=%s\n", AV_STRINGIFY(LIBAVCODEC_VERSION));
-+ #else
-+ printf("VER=%s\n", FFMPEG_VERSION);
-+ #endif
- printf("BUILD=%d\n", LIBAVCODEC_BUILD);
- return(0);
- }
-@@ -31135,7 +31139,7 @@
- echo "$as_me:$LINENO: checking for pkgconfig support for libpostproc" >&5
- echo $ECHO_N "checking for pkgconfig support for libpostproc... $ECHO_C" >&6
- if test x"$PKG_CONFIG" != x"no" ; then
-- if $PKG_CONFIG FFmpeg --exists ; then
-+ if $PKG_CONFIG libpostproc --exists ; then
- pkg_config_libpostproc="yes"
- fi
- fi
-@@ -31203,7 +31207,7 @@
- echo "${ECHO_T}user" >&6
- else
- if test x"$pkg_config_libpostproc" != x"no" ; then
-- libpostproc_ii="`$PKG_CONFIG FFmpeg --cflags`"
-+ libpostproc_ii="`$PKG_CONFIG libpostproc --cflags`"
- echo "$as_me:$LINENO: result: pkg-config" >&5
- echo "${ECHO_T}pkg-config" >&6
- else
-@@ -31413,7 +31417,7 @@
- echo "${ECHO_T}user" >&6
- else
- if test x"$pkg_config_libpostproc" != x"no" ; then
-- libpostproc_ll="`$PKG_CONFIG FFmpeg --libs`"
-+ libpostproc_ll="`$PKG_CONFIG libpostproc --libs`"
- echo "$as_me:$LINENO: result: pkg-config" >&5
- echo "${ECHO_T}pkg-config" >&6
- else
diff --git a/video/transcode/03_imagemagick.dpatch
b/video/transcode/03_imagemagick.dpatch
deleted file mode 100644
index a650e80..0000000
--- a/video/transcode/03_imagemagick.dpatch
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /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("");
diff --git a/video/transcode/DETAILS b/video/transcode/DETAILS
index 6777551..58ef1d7 100755
--- a/video/transcode/DETAILS
+++ b/video/transcode/DETAILS
@@ -1,11 +1,10 @@
SPELL=transcode
- VERSION=1.0.2
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:79424ae83ad244553c9d283bd9d8f57535e3bf2b36919f861a2cea9c00d31d8d46e6a00cab5fdc24ecaf2001af5338babd51fac30f18dbdc13dfb44c6ff45834
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.0.3
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_HASH
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.sourcemage.org/mirror/$SOURCE
- WEB_SITE=http://inferno.slug.org/cgi-bin/transcode
+ SOURCE_URL[0]=http://fromani.exit1.org/$SOURCE
+ WEB_SITE=http://www.transcoding.org
LICENSE[0]=GPL
ENTERED=20020430
KEYWORDS="video"
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 9d09756..e18437e 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,9 @@
+2007-04-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0.3, updated WEB_SITE to transcoding.org,
+ use official download location again
+ * PRE_BUILD, 01_configure.dpatch, 03_imagemagick.dpatch,
+ ffmpeg-api.patch: removed unnecessary patches
+
2007-01-07 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD, transcode-1.0.2-libmpeg3-1.7.patch: fix bug #13353

diff --git a/video/transcode/HISTORY~ b/video/transcode/HISTORY~
new file mode 100644
index 0000000..9ca1fed
--- /dev/null
+++ b/video/transcode/HISTORY~
@@ -0,0 +1,163 @@
+2007-04-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0.3, updated WEB_SITE to transcoding.org,
+ use official download location again
+ * PRE_BUILD, 01_configure.dpatch, 03_imagemagick.dpatch: removed
+ unnecessary patches
+
+2007-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, transcode-1.0.2-libmpeg3-1.7.patch: fix bug #13353
+
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, 01_configure.dpatch: fix configure script to work with
+ ffmpeg-svn, bug #13207
+ * PRE_BUILD: also fix configure script to work with lzo 2.0x
+
+2006-09-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed download location to
+ download.sourcemage.org/mirror, as the official download locations
+ are gone, bug #13120
+
+2006-08-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: [automated] Removed UPDATED (deprecated in favor of
+ PATCHLEVEL).
+
+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
+
+2005-11-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.2
+
+2005-07-24 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 1.0.0; remove GCC 3.4 variable;
+ * DEPENDS: remove GCC 3.4; add mpeg2dec.
+
+2005-06-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed libdv configure options, bug #9111
+
+2005-06-07 Sergey Lipnevich <sergey AT sourcemage.org>
+ * BUILD: make work with LZO 2.
+
+2005-05-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, ffmpeg-api.patch: patch to make it work with latest
+ ffmpeg-cvs
+
+2005-04-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS, DETAILS: use gcc 3.4
+
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Removed MAKE_NJOBS=1
+ * BUILD: Run make_single before make and make_normal afterwards
+
+2005-03-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --enable-v4l to OPTS
+
+2005-01-30 Arjan Bouter <abouter AT sourcemage.org>
+ * TRIGGERS: spell_installed -> spell_ok conversion
+
+2005-01-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed configure switches for libdvdread (bug #7929)
+
+2004-12-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added dependency on LIBAVCODEC, fixed switches for the
+ optional_depends, added dependency on zlib, added optional_depends
+ on libtheora and libquicktime
+
+2004-12-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.14,
+ changed WEB_SITE to http://inferno.slug.org/cgi-bin/transcode,
+ changed SOURCE_URL to http://www.jakemsr.com/transcode/$SOURCE
+ * BUILD, transcode-gcc34.patch: removed
+
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: SDL renamed to sdl
+
+2004-07-20 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: ImageMagick renamed to imagemagick
+ Formatted to Guru Handbook
+ * TRIGGERS: ImageMagick renamed to imagemagick
+
+2004-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, transcode-gcc34.patch: patch to compile with gcc 3.4
+
+2004-04-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * TRIGGERS: only check_self on cast of ImageMagick
+
+2004-01-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added --with-default-xvid=xvid4 to xvid switch
+
+2004-01-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.12
+
+2003-11-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.11
+
+2003-10-10 hgg <hgreig AT bigpond.net.au>
+ * DEPENDS: Change x11-libs to X11-LIBS
+
+2003-10-03 hgg <hgreig AT bigpond.net.au>
+ * DEPENDS: Change optional_depends xfree86 to x11-libs, needs devel
sorcery now
+
+2003-09-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.10
+
+2003-08-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: added BUILD file to make it build with newest avifile
+ * DEPENDS: made nasm optional
+ * BUILD:fixed freetype2 support
+
+2003-08-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.9
+
+2003-07-15 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Added MAKE_NJOBS=1
+
+2003-07-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.8
+
+2003-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.7
+ * DEPENDS: added optional_depends on mjpegtools (fixes bug #3505)
+
+2003-05-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS,BUILD,patch: updated to 0.6.6
+ removed the tmpfs performance patch (now part of the official
tarball)
+
+2003-05-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: disabled optional_depends on quicktime4linux (causes
tcprobe to
+ be broken)
+
+2003-04-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on libmpeg3 and quicktime4linux
+
+2003-04-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * TRIGGERS: added trigger to recast on_cast of ImageMagick, since the
+ ImageMagick libs change their name with every release
+
+2003-03-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: cleaned up the depends a bit
+
+2003-02-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD,patch: added the tmpfs performance patch (fixes bug #2470)
+
+2003-01-31 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.6.3
+
+2003-01-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on xvid
+ * DETAILS: updated to 0.6.3.20030123 (pre version, fixes some
problems)
+
+2002-11-22 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Added extra dependencies, thanks to
+ Treeve Jelbert <treeve AT sourcemage.org
+
+2002-11-21 Eric Sandall <sandalle AT sourcemage.org>
+ * ALL: Added to video
+
+2002-11-09 Eric Sandall <sandalle AT sourcemage.org>
+ * ALL: Created Spell
+
diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index 2eeceb1..302ff2b 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ffmpeg-api.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/03_imagemagick.dpatch &&
-patch -p1 < $SCRIPT_DIRECTORY/01_configure.dpatch &&
patch -p1 < $SCRIPT_DIRECTORY/transcode-1.0.2-libmpeg3-1.7.patch &&
sedit 's/-llzo/-llzo2/' configure
diff --git a/video/transcode/ffmpeg-api.patch
b/video/transcode/ffmpeg-api.patch
deleted file mode 100644
index a4cf2cb..0000000
--- a/video/transcode/ffmpeg-api.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- export/export_ffmpeg.c.orig 2005-05-05 21:41:29.000000000 +0200
-+++ export/export_ffmpeg.c 2005-05-05 21:41:39.000000000 +0200
-@@ -672,6 +672,10 @@
- }
- }
-
-+#if LIBAVCODEC_BUILD >= 4753
-+#define frame_rate time_base.den
-+#define frame_rate_base time_base.num
-+#endif
- switch (vob->ex_frc) {
- case 1: // 23.976
- lavc_venc_context->frame_rate = 24000;
diff --git a/video/transcode/transcode-1.0.3.tar.bz2.sig
b/video/transcode/transcode-1.0.3.tar.bz2.sig
new file mode 100644
index 0000000..198f3e2
Binary files /dev/null and b/video/transcode/transcode-1.0.3.tar.bz2.sig
differ



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (09df74bc78db36fb5f3eb5bcad8a6774fe0b29be), Arwed von Merkatz, 04/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page