Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (7dd7d7f6ab04e6010f0a061a8b94e5a5769d3056)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (7dd7d7f6ab04e6010f0a061a8b94e5a5769d3056)
  • Date: Tue, 21 Oct 2008 18:02:32 -0500

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

ChangeLog | 3 ++
audio-libs/aften/BUILD | 1
audio-libs/aften/DETAILS | 16 ++++++++++
audio-libs/aften/HISTORY | 3 ++
devel/recode/HISTORY | 5 +++
devel/recode/PRE_BUILD | 3 +-
devel/recode/gcc43.patch | 17 +++++++++++
devel/recode/recode.patch | 68
----------------------------------------------
video/avidemux2/BUILD | 1
video/avidemux2/DEPENDS | 44 +++++++++++++++++++++--------
video/avidemux2/HISTORY | 7 ++++
11 files changed, 86 insertions(+), 82 deletions(-)

New commits:
commit 7dd7d7f6ab04e6010f0a061a8b94e5a5769d3056
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

aften: new spell, a simple A/52 (AC-3) audio encoder

commit 4214337259b19195be5645a09ae8dae06a6cecea
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

avidemux2: in DEPENDS, added cmake flags to disable each optional
dependency. Added aften, esound, JACK-DRIVER and libsamplerate as
optional dependencies
in BUILD, removed -DCMAKE_INSTALL_PREFIX setting, the same value is
already set by sorcery

commit 85d25be7503021d58672a786120a15993d8cbc1e
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

recode: added gcc43.patch to fix compilation issue with gcc 4.3, applied
in PRE_BUILD
removed recode.patch: it has never been applied and doesn't work

diff --git a/ChangeLog b/ChangeLog
index b7e0584..548064e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-10-21 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * audio-libs/aften: new spell, a simple A/52 (AC-3) audio encoder
+
2008-10-21 Justin Boffemmyer <flux AT sourcemage.org>
* devel/crm114: moved to utils/crm114

diff --git a/audio-libs/aften/BUILD b/audio-libs/aften/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/audio-libs/aften/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/audio-libs/aften/DETAILS b/audio-libs/aften/DETAILS
new file mode 100755
index 0000000..aef9cfa
--- /dev/null
+++ b/audio-libs/aften/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=aften
+ VERSION=0.0.8
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:1261297eac5065c6f028618d3e15e9b152ac35440c74cfb09d98cd99a90fb1c6a49585f70928834c3f6ddbcdd1d8721f7329d24f57cd30901dff09bbc0d419e3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://aften.sourceforge.net/ "
+ LICENSE[0]=LGPL
+ ENTERED=20081019
+ SHORT="A simple A/52 (AC-3) audio encoder."
+cat << EOF
+Aften is a simple A/52 (AC-3) audio encoder based on the FFMpeg libraries.
The
+name is an acronym for A/Fifty-Two ENcoder. It is also Danish and Norwegian
+word for 'evening'. It is able to create stereo and multi-channel
+AC3-compatible audio streams.
+EOF
diff --git a/audio-libs/aften/HISTORY b/audio-libs/aften/HISTORY
new file mode 100644
index 0000000..6992179
--- /dev/null
+++ b/audio-libs/aften/HISTORY
@@ -0,0 +1,3 @@
+2008-10-21 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS, BUILD: spell created
+
diff --git a/devel/recode/HISTORY b/devel/recode/HISTORY
index 58ebffc..7e04d2a 100644
--- a/devel/recode/HISTORY
+++ b/devel/recode/HISTORY
@@ -1,3 +1,8 @@
+2008-10-21 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * gcc43.patch: added, to fix compilation issue with gcc 4.3
+ * PRE_BUILD: apply gcc43.patch
+ * recode.patch: removed, it has never been applied and doesn't work
+
2008-01-18 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* PRE_BUILD: added, apply patch for x86_64
* config.sub.patch: added
diff --git a/devel/recode/PRE_BUILD b/devel/recode/PRE_BUILD
index 9c1f681..315c601 100755
--- a/devel/recode/PRE_BUILD
+++ b/devel/recode/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/config.sub.patch
+patch -p0 < $SPELL_DIRECTORY/config.sub.patch &&
+patch -p0 < $SPELL_DIRECTORY/gcc43.patch
diff --git a/devel/recode/gcc43.patch b/devel/recode/gcc43.patch
new file mode 100644
index 0000000..18927ff
--- /dev/null
+++ b/devel/recode/gcc43.patch
@@ -0,0 +1,17 @@
+--- src/recodext.h 2008-04-03 18:35:42 +0000
++++ src/recodext.h 2008-04-03 18:36:32 +0000
+@@ -215,10 +215,10 @@
+ struct recode_single *unsurfacer;
+
+ /* Non zero if this is an acceptable charset (not only a surface). */
+- enum recode_symbol_type type : 3;
++ enum recode_symbol_type type : 2;
+
+ /* Non zero if this one should be ignored. */
+- bool ignore : 2;
++ bool ignore : 1;
+ };
+
+ struct recode_surface_list
+
+
diff --git a/devel/recode/recode.patch b/devel/recode/recode.patch
deleted file mode 100644
index 4a9f2dd..0000000
--- a/devel/recode/recode.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- recode-3.6.orig/src/libiconv.c
-+++ recode-3.6/src/libiconv.c
-@@ -1,5 +1,5 @@
- /* Conversion of files between different charsets and surfaces.
-- Copyright � 1999, 2000 Free Software Foundation, Inc.
-+ Copyright � 1999, 2000, 2001 Free Software Foundation, Inc.
- Contributed by Fran�ois Pinard <pinard AT iro.umontreal.ca>, 1999,
- and Bruno Haible <haible AT clisp.cons.org>, 2000.
-
-@@ -195,12 +195,17 @@
- memcpy() doesn't do here, because the regions might overlap.
- memmove() isn't worth it, because we rarely have to move more
- than 12 bytes. */
-- if (input > input_buffer && input_left > 0)
-+ cursor = input_buffer;
-+ if (input_left > 0)
- {
-- cursor = input_buffer;
-- do
-- *cursor++ = *input++;
-- while (--input_left > 0);
-+ if (input > input_buffer)
-+ {
-+ do
-+ *cursor++ = *input++;
-+ while (--input_left > 0);
-+ }
-+ else
-+ cursor += input_left;
- }
- }
-
---- recode-3.6.orig/src/request.c
-+++ recode-3.6/src/request.c
-@@ -1073,7 +1073,7 @@
- if (task->output.cursor + 4 >= task->output.limit)
- {
- RECODE_OUTER outer = task->request->outer;
-- size_t old_size = task->output.limit - task->output.buffer;
-+ size_t old_size = task->output.cursor - task->output.buffer;
- size_t new_size = task->output.cursor + 4 - task->output.buffer;
-
- /* FIXME: Rethink about how the error should be reported. */
---- recode-3.6.orig/src/task.c
-+++ recode-3.6/src/task.c
-@@ -1198,6 +1198,8 @@
- else
- success = transform_mere_copy (subtask);
-
-+ task->output = subtask->output;
-+
- if (subtask->input.name && *subtask->input.name)
- fclose (subtask->input.file);
- if (subtask->output.name && *subtask->output.name)
---- recode-3.6.orig/src/hash.h
-+++ recode-3.6/src/hash.h
-@@ -21,6 +21,11 @@
- /* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use
- obstacks instead of malloc, and recompile `hash.c' with same setting. */
-
-+#define hash_lookup recode_hash_lookup
-+#define hash_delete recode_hash_delete
-+#define hash_free recode_hash_free
-+#define hash_insert recode_hash_insert
-+
- #ifndef PARAMS
- # if PROTOTYPES || __STDC__
- # define PARAMS(Args) Args
diff --git a/video/avidemux2/BUILD b/video/avidemux2/BUILD
index 2e55edc..c8d7939 100755
--- a/video/avidemux2/BUILD
+++ b/video/avidemux2/BUILD
@@ -2,5 +2,4 @@ if is_depends_enabled $SPELL qt4; then
OPTS="-DQT_QMAKE_EXECUTABLE=${INSTALL_ROOT}/usr/bin/qt4/qmake
-DLRELEASE_EXECUTABLE=${INSTALL_ROOT}/usr/bin/qt4/lrelease $OPTS"
fi &&

-OPTS="-DCMAKE_INSTALL_PREFIX=${INSTALL_ROOT}/usr $OPTS" &&
cmake_build
diff --git a/video/avidemux2/DEPENDS b/video/avidemux2/DEPENDS
index 556a633..b25cb7e 100755
--- a/video/avidemux2/DEPENDS
+++ b/video/avidemux2/DEPENDS
@@ -2,8 +2,8 @@ depends cmake &&
depends g++ &&
depends libxml2 &&

-optional_depends gtk+2 "" "" "for gtk+2 gui" &&
-optional_depends qt4 "" "" "for Qt gui" &&
+optional_depends gtk+2 "" "-DNO_GTK=1" "for gtk+2 gui" &&
+optional_depends qt4 "" "-DNO_QT4=1" "for Qt gui" &&

optional_depends libmad \
"" \
@@ -15,52 +15,72 @@ optional_depends a52dec \
"" \
"for AC3 audio decoding" &&

-optional_depends libdca \
+optional_depends aften \
"" \
+ "-DNO_Aften=1" \
+ "for AC3 audio encoding" &&
+
+optional_depends libdca \
"" \
+ "-DNO_libdca=1" \
"for DTS audio decoding" &&

optional_depends lame \
"" \
- "" \
+ "-DNO_Lame=1" \
"for mp3 audio encoding" &&

optional_depends libvorbis \
"" \
- "" \
+ "-DNO_Vorbis=1" \
"for OGG/Vorbis support" &&

optional_depends xvid \
"" \
- "" \
+ "-DNO_Xvid=1" \
"for xvid video encoding" &&

optional_depends x264 \
"" \
- "" \
+ "-DNO_x264=1" \
"for H264 video encoding" &&

optional_depends freetype2 \
"" \
- "" \
+ "-DNO_FREETYPE=1" \
"for subtitle rendering" &&

optional_depends arts \
"" \
- "" \
+ "-DNO_ARTS=1" \
"for arts audio output" &&

optional_depends alsa-lib \
"" \
- "" \
+ "-DNO_ALSA=1" \
"for alsa audio output" &&

+optional_depends esound \
+ "" \
+ "-DNO_Esd=1" \
+ "for esd audio output" &&
+
+optional_depends JACK-DRIVER \
+ "" \
+ "-DNO_Jack=1" \
+ "for jack driver support" &&
+
+optional_depends libsamplerate \
+ "" \
+ "-DNO_libsamplerate=1" \
+ "for resampling support" &&
+
optional_depends faad2 \
"" \
- "" \
+ "-DNO_FAAC=1 -DNO_FAAD=1 -DNO_NeAAC=1" \
"for AAC audio decoding" &&

optional_depends sdl \
"" \
- "" \
+ "-DNO_SDL=1" \
"for SDL audio/video output"
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index 14c8df0..a3e0400 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,10 @@
+2008-10-21 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: added cmake flags to disable each optional dependency,
+ added aften, esound, JACK-DRIVER and libsamplerate as optional
+ dependencies
+ * BUILD: removed -DCMAKE_INSTALL_PREFIX setting, the same value is
+ already set by sorcery
+
2008-08-18 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.4.3
* BUILD: switched from autotools to cmake, removed CFLAGS and CXXFLAGS



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (7dd7d7f6ab04e6010f0a061a8b94e5a5769d3056), Julien ROZO, 10/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page