Skip to Content.
Sympa Menu

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

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 (e72b0599be2d4b9a7831de8092f402f31999b2bc)
  • Date: Sun, 16 Sep 2007 16:03:04 -0500

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

dev/null |binary
video/transcode/DEPENDS | 5 --
video/transcode/DETAILS | 2
video/transcode/HISTORY | 6 ++
video/transcode/PRE_BUILD | 2
video/transcode/avcodec.patch | 12 -----
video/transcode/transcode-1.0.2-libmpeg3-1.7.patch | 45
---------------------
video/transcode/transcode-1.0.3.tar.bz2.sig | 0
video/transcode/transcode-1.0.4.tar.bz2.sig |binary
9 files changed, 7 insertions(+), 65 deletions(-)

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

transcode: updated to 1.0.4

diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index 76539d2..f9af725 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -26,11 +26,6 @@ optional_depends sdl \
"--disable-sdl" \
"for SDL preview plugin" &&

-optional_depends gtk+ \
- "--enable-gtk" \
- "--disable-gtk" \
- "for GTK preview plugin" &&
-
optional_depends libdv \
"--enable-libdv" \
"--disable-libdv" \
diff --git a/video/transcode/DETAILS b/video/transcode/DETAILS
index 58ef1d7..e80917b 100755
--- a/video/transcode/DETAILS
+++ b/video/transcode/DETAILS
@@ -1,5 +1,5 @@
SPELL=transcode
- VERSION=1.0.3
+ VERSION=1.0.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG=gurus.gpg:$SOURCE.sig:UPSTREAM_HASH
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 72dd03d..dbbac57 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,9 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0.4
+ * DEPENDS: removed gtk+ optional_depends
+ * PRE_BUILD, avcodec.patch, transcode-1.0.2-libmpeg3-1.7.patch:
+ removed patches
+
2007-07-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, avcodec.patch: patch to work with current ffmpeg-svn,
bug #13866
diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index 3f3e556..bb38c05 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,5 +1,3 @@
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
deleted file mode 100644
index bc79bf3..0000000
--- a/video/transcode/avcodec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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) {
diff --git a/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
b/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
deleted file mode 100644
index 8a058af..0000000
--- a/video/transcode/transcode-1.0.2-libmpeg3-1.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- transcode-1.0.2/import/import_mpeg3.c.orig 2006-09-09 23:39:08.598897708
+0200
-+++ transcode-1.0.2/import/import_mpeg3.c 2006-09-09 23:40:36.455540042
+0200
-@@ -68,7 +68,7 @@
- MOD_open
- {
-
-- int i;
-+ int i,return_value;
-
- param->fd = NULL;
-
-@@ -79,14 +79,14 @@
- if (param->flag == TC_VIDEO) {
- if (!file) {
- if (!file_a) {
-- if((file = mpeg3_open(vob->video_in_file))==NULL) {
-+ if((file = mpeg3_open(vob->video_in_file,
&return_value))==NULL) {
- fprintf(stderr, "open file failed\n");
- return(TC_IMPORT_ERROR);
- }
- if (verbose & TC_DEBUG)
- printf("[%s] Opened video NO copy\n", MOD_NAME);
- } else if (file_a) {
-- if((file = mpeg3_open_copy(vob->video_in_file, file_a))==NULL) {
-+ if((file = mpeg3_open_copy(vob->video_in_file, file_a,
&return_value))==NULL) {
- fprintf(stderr, "open file failed\n");
- return(TC_IMPORT_ERROR);
- }
-@@ -98,14 +98,14 @@
- if (param->flag == TC_AUDIO) {
- if (!file_a) {
- if (!file) {
-- if((file_a = mpeg3_open(vob->audio_in_file))==NULL) {
-+ if((file_a = mpeg3_open(vob->audio_in_file,
&return_value))==NULL) {
- fprintf(stderr, "open audio file failed\n");
- return(TC_IMPORT_ERROR);
- }
- if (verbose & TC_DEBUG)
- printf("[%s] Opened audio NO copy\n", MOD_NAME);
- } else if (file) {
-- if((file_a = mpeg3_open_copy(vob->audio_in_file, file))==NULL) {
-+ if((file_a = mpeg3_open_copy(vob->audio_in_file, file,
&return_value))==NULL) {
- fprintf(stderr, "open_copy audio file failed\n");
- return(TC_IMPORT_ERROR);
- }
diff --git a/video/transcode/transcode-1.0.3.tar.bz2.sig
b/video/transcode/transcode-1.0.3.tar.bz2.sig
deleted file mode 100644
index 198f3e2..0000000
Binary files a/video/transcode/transcode-1.0.3.tar.bz2.sig and /dev/null
differ
diff --git a/video/transcode/transcode-1.0.4.tar.bz2.sig
b/video/transcode/transcode-1.0.4.tar.bz2.sig
new file mode 100644
index 0000000..8d523da
Binary files /dev/null and b/video/transcode/transcode-1.0.4.tar.bz2.sig
differ



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

Archive powered by MHonArc 2.6.24.

Top of Page