Skip to Content.
Sympa Menu

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

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 (acc8077e2f6b03bdae84f801d420942d758c0313)
  • Date: Sat, 7 Jul 2007 13:09:20 -0500

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

video/transcode/HISTORY | 4 +
video/transcode/HISTORY~ | 163
------------------------------------------
video/transcode/PRE_BUILD | 1
video/transcode/avcodec.patch | 12 +++
4 files changed, 17 insertions(+), 163 deletions(-)

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

transcode: patch to work with current ffmpeg-svn, bug #13866

diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 0cad6d6..72dd03d 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,7 @@
+2007-07-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, avcodec.patch: patch to work with current ffmpeg-svn,
+ bug #13866
+
2007-04-28 David Kowis <dkowis AT shlrm.org>
* DEPENDS: added some version voodoo to the avifile depends so that it
can find the includes. Added install_root.
diff --git a/video/transcode/HISTORY~ b/video/transcode/HISTORY~
deleted file mode 100644
index 9ca1fed..0000000
--- a/video/transcode/HISTORY~
+++ /dev/null
@@ -1,163 +0,0 @@
-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 302ff2b..3f3e556 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SCRIPT_DIRECTORY/transcode-1.0.2-libmpeg3-1.7.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/avcodec.patch &&
sedit 's/-llzo/-llzo2/' configure
diff --git a/video/transcode/avcodec.patch b/video/transcode/avcodec.patch
new file mode 100644
index 0000000..bc79bf3
--- /dev/null
+++ b/video/transcode/avcodec.patch
@@ -0,0 +1,12 @@
+--- export/aud_aux.c-org 2007-07-07 13:34:28.000000000 +0200
++++ export/aud_aux.c 2007-07-07 13:34:56.000000000 +0200
+@@ -361,8 +361,7 @@
+
+ pthread_mutex_lock(&init_avcodec_lock);
+ avcodec_init();
+- register_avcodec(&ac3_encoder);
+- register_avcodec(&mp2_encoder);
++ avcodec_register_all();
+ pthread_mutex_unlock(&init_avcodec_lock);
+
+ switch (o_codec) {



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (acc8077e2f6b03bdae84f801d420942d758c0313), Arwed von Merkatz, 07/07/2007

Archive powered by MHonArc 2.6.24.

Top of Page