Skip to Content.
Sympa Menu

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

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 (9c3d5f4fa06e5d0e2378436f55097855f9727885)
  • Date: Fri, 11 Jan 2008 11:17:02 -0600

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

dev/null |binary
video/avidemux2/DEPENDS | 6 +++++-
video/avidemux2/DETAILS | 2 +-
video/avidemux2/HISTORY | 8 ++++++++
video/avidemux2/PRE_BUILD | 2 +-
video/avidemux2/avidemux_2.3.0.tar.gz.sig | 0
video/avidemux2/avidemux_2.4.tar.gz.sig |binary
video/avidemux2/gcc-4-2.patch | 28 ----------------------------
8 files changed, 15 insertions(+), 31 deletions(-)

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

avidemux2: updated to 2.4

diff --git a/video/avidemux2/DEPENDS b/video/avidemux2/DEPENDS
index 3352e05..a87e582 100755
--- a/video/avidemux2/DEPENDS
+++ b/video/avidemux2/DEPENDS
@@ -1,8 +1,12 @@
+depends autoconf &&
+depends automake &&
depends g++ &&
-depends gtk+2 &&
depends libxml2 &&
depends GECKO &&

+optional_depends gtk+2 "" "" "for gtk+2 gui" &&
+optional_depends qt4 "" "" "for Qt gui" &&
+
optional_depends libmad \
"" \
"" \
diff --git a/video/avidemux2/DETAILS b/video/avidemux2/DETAILS
index c9d979f..bd31ec1 100755
--- a/video/avidemux2/DETAILS
+++ b/video/avidemux2/DETAILS
@@ -1,5 +1,5 @@
SPELL=avidemux2
- VERSION=2.3.0
+ VERSION=2.4
SOURCE=avidemux_$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/avidemux_$VERSION
SOURCE_URL[0]=http://download.berlios.de/avidemux/$SOURCE
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index 8034b9f..e9125a5 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,11 @@
+2008-01-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 2.4
+ * PRE_BUILD, gcc-4-2.patch: removed patch
+ * PRE_BUILD: call make -f Makefile.dist to create the autotools
+ build system
+ * DEPENDS: added autoconf, automake. Made gtk+2 optional, added
+ optional qt4
+
2007-12-19 Julien "_kaze_" ROZO <julien AT rozo.org>
* PRE_BUILD, gcc-4-2.patch: added patch to compile with gcc 4.2.x

diff --git a/video/avidemux2/PRE_BUILD b/video/avidemux2/PRE_BUILD
index ac87e54..03886a8 100755
--- a/video/avidemux2/PRE_BUILD
+++ b/video/avidemux2/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/gcc-4-2.patch
+make -f Makefile.dist
diff --git a/video/avidemux2/avidemux_2.3.0.tar.gz.sig
b/video/avidemux2/avidemux_2.3.0.tar.gz.sig
deleted file mode 100644
index 6bd4b8a..0000000
Binary files a/video/avidemux2/avidemux_2.3.0.tar.gz.sig and /dev/null differ
diff --git a/video/avidemux2/avidemux_2.4.tar.gz.sig
b/video/avidemux2/avidemux_2.4.tar.gz.sig
new file mode 100644
index 0000000..30d75f2
Binary files /dev/null and b/video/avidemux2/avidemux_2.4.tar.gz.sig differ
diff --git a/video/avidemux2/gcc-4-2.patch b/video/avidemux2/gcc-4-2.patch
deleted file mode 100644
index 52fdd95..0000000
--- a/video/avidemux2/gcc-4-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- avidemux/ADM_lavformat/ADM_lavformat.cpp.orig Mon May 28 10:32:13
2007
-+++ avidemux/ADM_lavformat/ADM_lavformat.cpp Mon May 28 10:33:09 2007
-@@ -260,10 +260,12 @@
- switch(_fps1000)
- {
- case 25000:
-+ {
- c->time_base= (AVRational){1001,25025};
- //c->frame_rate = 25025;
- //c->frame_rate_base = 1001;
- break;
-+ }
- case 23976:
- /*
- c->frame_rate = 24000;
-@@ -276,10 +278,12 @@
- break;
- }
- case 29970:
-+ {
- c->time_base= (AVRational){1001,30000};
- //c->frame_rate = 30000;
- //c->frame_rate_base = 1001;
- break;
-+ }
- default:
- if(_type==MUXER_MP4 || _type==MUXER_PSP)
- {



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (9c3d5f4fa06e5d0e2378436f55097855f9727885), Arwed von Merkatz, 01/11/2008

Archive powered by MHonArc 2.6.24.

Top of Page