Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4860672d0ebc54d5b06d2a1a517628a084b048c0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4860672d0ebc54d5b06d2a1a517628a084b048c0)
  • Date: Tue, 1 Aug 2006 08:32:02 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

ChangeLog | 6
audio-libs/faac/DEPENDS | 4
audio-libs/faac/DETAILS | 14 +
audio-libs/faac/HISTORY | 2
audio-libs/faac/PRE_BUILD | 5
audio-libs/faad2/DEPENDS | 3
audio-libs/faad2/DETAILS | 7
audio-libs/faad2/HISTORY | 8
audio-libs/faad2/Makefile.am.patch | 14 -
audio-libs/faad2/PRE_BUILD | 5
audio-libs/faad2/gcc-3.4.patch | 47 ---
audio-libs/faad2/mk.diff | 76 +++++
database/hk_classes/DETAILS | 4
database/hk_classes/HISTORY | 3
database/knoda/DETAILS | 4
database/knoda/HISTORY | 3
graphics/dcraw/DETAILS | 7
graphics/dcraw/HISTORY | 3
video-libs/quicktime4linux/BUILD | 13 -
video-libs/quicktime4linux/DEPENDS | 10
video-libs/quicktime4linux/DETAILS | 6
video-libs/quicktime4linux/HISTORY | 13 +
video-libs/quicktime4linux/Makefile.patch | 73 -----
video-libs/quicktime4linux/PRE_BUILD | 9
video-libs/quicktime4linux/gcc-3.4.patch | 72 -----
video-libs/quicktime4linux/mk.diff | 386
++++++++++++++++++++++++++++++
video-libs/x264/BUILD | 4
video-libs/x264/DEPENDS | 3
video-libs/x264/DETAILS | 29 ++
video-libs/x264/HISTORY | 4
30 files changed, 595 insertions(+), 242 deletions(-)

New commits:
commit f93278940540d1282093da95d52b8f67d9a517f3
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

x264 - new spell

commit 25b185056be453e2fcc6d0b01ea59e14790ccd97
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

faac-1.24

commit c1e798de5092e239d8fc8545034a6ecc5db119b7
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

quicktime4linux-2.2

commit 3d94808492b2ede43fb641aabb4ac366f61aa3bb
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

knoda-0.8.2-test2

commit ead49129954a458aaf9c60f78a8d0af200ff7e57
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

hk_classes-0.8.2-test2

commit 6a37a42694a67e0d76c68bd0ed69277fb5d0bb5c
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

faad2 - fix compile with gcc-4.1.1

commit 5ef4377c950de796a4aa6e899850a47166809ac4
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

dcraw-1.337

diff --git a/ChangeLog b/ChangeLog
index 2f14d8e..d3fb2c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-01 Treeve Jelbert <treeve AT pi.be>
+ * video-libs/x264: new spell, video encoder
+
+2006-08-01 Treeve Jelbert <treeve AT pi.be>
+ * audio-libs/faac: new spell
+
2006-07-31 Juuso Alasuutari <iuso AT sourcemage.org>
* audio-creation/lmms: New spell, Linux MultiMedia Studio.

diff --git a/audio-libs/faac/DEPENDS b/audio-libs/faac/DEPENDS
new file mode 100755
index 0000000..91f4a58
--- /dev/null
+++ b/audio-libs/faac/DEPENDS
@@ -0,0 +1,4 @@
+depends autoconf &&
+depends automake &&
+depends libtool
+optional_depends faad2 "" "" "for MPEG4v2 support"
diff --git a/audio-libs/faac/DETAILS b/audio-libs/faac/DETAILS
new file mode 100755
index 0000000..a5b03c1
--- /dev/null
+++ b/audio-libs/faac/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=faac
+ VERSION=1.24
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/faac/$SOURCE
+
SOURCE_HASH=sha512:56d66d65a433a69c5c294ec3a50cde4900dbd8fd1242f5091e8e1213c572f654ae58ff1d9f39aa726dd7ca59322da6e09410b670eb8965f023820a364370b068
+ WEB_SITE=http://www.audiocoding.com/
+ LICENSE[0]=LGPL
+ ENTERED=20060801
+ KEYWORDS="iso audio libs"
+ SHORT="mpeg decoder"
+cat << EOF
+mpeg decoder
+EOF
diff --git a/audio-libs/faac/HISTORY b/audio-libs/faac/HISTORY
new file mode 100644
index 0000000..e14558c
--- /dev/null
+++ b/audio-libs/faac/HISTORY
@@ -0,0 +1,2 @@
+2006-07-31 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: new WEB_SITE
diff --git a/audio-libs/faac/PRE_BUILD b/audio-libs/faac/PRE_BUILD
new file mode 100755
index 0000000..06e3ce1
--- /dev/null
+++ b/audio-libs/faac/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# patch -p1 < ${SCRIPT_DIRECTORY}/mk.diff
+chmod u+x ./bootstrap &&
+/bin/sh ./bootstrap
diff --git a/audio-libs/faad2/DEPENDS b/audio-libs/faad2/DEPENDS
index b7efe47..af9b833 100755
--- a/audio-libs/faad2/DEPENDS
+++ b/audio-libs/faad2/DEPENDS
@@ -1,8 +1,7 @@
depends autoconf &&
depends automake &&
depends libtool &&
-depends gcc34 &&
-#depends g++ &&
+depends g++ &&

if [ "$XMMS" = "y" ]; then
depends xmms '--with-xmms' &&
diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS
index b24654a..d4e9b64 100755
--- a/audio-libs/faad2/DETAILS
+++ b/audio-libs/faad2/DETAILS
@@ -16,13 +16,12 @@ else
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=${SOURCEFORGE_URL}/faac/$SOURCE

SOURCE_HASH=sha512:b4e027df5a5f4bd464307d79c56e81f98f956635107407a01f4eb2138fd7a6b6b91651bbe4d888e3c6aa6b0a57981f36627ef208d947c2d4d1d4573432d2fbe8
+# GCC_VERSION=3.4
fi
- WEB_SITE=http://faac.sourceforge.net/
- GCC_VERSION=3.4
- BUILD_API=2
+ WEB_SITE=http://www.audiocoding.com/
+# GCC_VERSION=3.4
LICENSE[0]=GPL
ENTERED=20030203
- UPDATED=20041022
KEYWORDS="iso audio libs"
SHORT="FAAD2 is the fastest ISO AAC audio decoder available."
cat << EOF
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 30a61c3..3e2d683 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,11 @@
+2006-07-31 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: new WEB_SITE
+ * DETAILS, DEPENDS: don't need gcc34, builds fine with gcc-4.1.1
+ * gcc-3.4.patch, Makefile.am.patch: deleted
+ * mk.diff: add
+ replaces previous patches and fixes compile with gcc-4.1.1
+ * PRE_BUILD: apply mk.diff
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/audio-libs/faad2/Makefile.am.patch
b/audio-libs/faad2/Makefile.am.patch
deleted file mode 100644
index f7d37e0..0000000
--- a/audio-libs/faad2/Makefile.am.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.am 2004-07-16 07:40:43.673717944 -0700
-+++ Makefile.am 2004-07-16 07:40:24.385650176 -0700
-@@ -2,7 +2,7 @@
-
- EXTRA_DIST = faad2.spec
-
--rpm: Makefile
-- make dist
-- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-- rm $(PACKAGE)-$(VERSION).tar.gz
-+rpm: Makefile
-+ make dist
-+ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-+ rm $(PACKAGE)-$(VERSION).tar.gz
diff --git a/audio-libs/faad2/PRE_BUILD b/audio-libs/faad2/PRE_BUILD
index 516abb4..8710950 100755
--- a/audio-libs/faad2/PRE_BUILD
+++ b/audio-libs/faad2/PRE_BUILD
@@ -1,8 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
if [ "$FAAD_CVS" = "n" ]; then
- patch -p0 < ${SCRIPT_DIRECTORY}/Makefile.am.patch &&
- patch -p0 < ${SCRIPT_DIRECTORY}/gcc-3.4.patch
+# patch -p0 < ${SCRIPT_DIRECTORY}/Makefile.am.patch &&
+# patch -p0 < ${SCRIPT_DIRECTORY}/gcc-3.4.patch
+ patch -p1 < ${SCRIPT_DIRECTORY}/mk.diff
else
patch -p1 < ${SCRIPT_DIRECTORY}/faad2-enable-drm.patch &&
sedit '45i#include <stdarg.h>' frontend/main.c
diff --git a/audio-libs/faad2/gcc-3.4.patch b/audio-libs/faad2/gcc-3.4.patch
deleted file mode 100644
index 63029db..0000000
--- a/audio-libs/faad2/gcc-3.4.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- common/mp4v2/mp4property.h~ 2003-06-29 23:41:00.000000000 +0200
-+++ common/mp4v2/mp4property.h 2004-09-19 23:22:54.511979843 +0200
-@@ -58,7 +58,7 @@
- return m_name;
- }
-
-- virtual MP4PropertyType GetType() = NULL;
-+ virtual MP4PropertyType GetType() = 0;
-
- bool IsReadOnly() {
- return m_readOnly;
-@@ -74,17 +74,17 @@
- m_implicit = value;
- }
-
-- virtual u_int32_t GetCount() = NULL;
-- virtual void SetCount(u_int32_t count) = NULL;
-+ virtual u_int32_t GetCount() = 0;
-+ virtual void SetCount(u_int32_t count) = 0;
-
- virtual void Generate() { /* default is a no-op */ };
-
-- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
-+ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0;
-
-- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
-+ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
-
- virtual void Dump(FILE* pFile, u_int8_t indent,
-- bool dumpImplicits, u_int32_t index = 0) = NULL;
-+ bool dumpImplicits, u_int32_t index = 0) = 0;
-
- virtual bool FindProperty(const char* name,
- MP4Property** ppProperty, u_int32_t* pIndex = NULL);
---- common/mp4v2/rtphint.h~ 2003-06-29 23:41:00.000000000 +0200
-+++ common/mp4v2/rtphint.h 2004-09-19 23:23:15.279332931 +0200
-@@ -35,8 +35,8 @@
- return m_pPacket;
- }
-
-- virtual u_int16_t GetDataSize() = NULL;
-- virtual void GetData(u_int8_t* pDest) = NULL;
-+ virtual u_int16_t GetDataSize() = 0;
-+ virtual void GetData(u_int8_t* pDest) = 0;
-
- MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
-
diff --git a/audio-libs/faad2/mk.diff b/audio-libs/faad2/mk.diff
new file mode 100644
index 0000000..9539860
--- /dev/null
+++ b/audio-libs/faad2/mk.diff
@@ -0,0 +1,76 @@
+diff -uNr faad2/common/mp4ff/mp4ff.c faad2.cp/common/mp4ff/mp4ff.c
+--- faad2/common/mp4ff/mp4ff.c 2004-01-11 16:52:18.000000000 +0100
++++ faad2.cp/common/mp4ff/mp4ff.c 2006-07-31 22:47:13.000000000 +0200
+@@ -87,7 +87,7 @@
+ if (ff) free(ff);
+ }
+
+-static void mp4ff_track_add(mp4ff_t *f)
++void mp4ff_track_add(mp4ff_t *f)
+ {
+ f->total_tracks++;
+
+diff -uNr faad2/common/mp4v2/mp4property.h
faad2.cp/common/mp4v2/mp4property.h
+--- faad2/common/mp4v2/mp4property.h 2003-06-29 23:41:00.000000000 +0200
++++ faad2.cp/common/mp4v2/mp4property.h 2006-07-31 22:44:42.000000000
+0200
+@@ -58,7 +58,7 @@
+ return m_name;
+ }
+
+- virtual MP4PropertyType GetType() = NULL;
++ virtual MP4PropertyType GetType() = 0;
+
+ bool IsReadOnly() {
+ return m_readOnly;
+@@ -74,17 +74,17 @@
+ m_implicit = value;
+ }
+
+- virtual u_int32_t GetCount() = NULL;
+- virtual void SetCount(u_int32_t count) = NULL;
++ virtual u_int32_t GetCount() = 0;
++ virtual void SetCount(u_int32_t count) = 0;
+
+ virtual void Generate() { /* default is a no-op */ };
+
+- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
++ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0;
+
+- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
++ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
+
+ virtual void Dump(FILE* pFile, u_int8_t indent,
+- bool dumpImplicits, u_int32_t index = 0) = NULL;
++ bool dumpImplicits, u_int32_t index = 0) = 0;
+
+ virtual bool FindProperty(const char* name,
+ MP4Property** ppProperty, u_int32_t* pIndex = NULL);
+diff -uNr faad2/common/mp4v2/rtphint.h faad2.cp/common/mp4v2/rtphint.h
+--- faad2/common/mp4v2/rtphint.h 2003-06-29 23:41:00.000000000 +0200
++++ faad2.cp/common/mp4v2/rtphint.h 2006-07-31 22:44:42.000000000 +0200
+@@ -35,8 +35,8 @@
+ return m_pPacket;
+ }
+
+- virtual u_int16_t GetDataSize() = NULL;
+- virtual void GetData(u_int8_t* pDest) = NULL;
++ virtual u_int16_t GetDataSize() = 0;
++ virtual void GetData(u_int8_t* pDest) = 0;
+
+ MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
+
+diff -uNr faad2/Makefile.am faad2.cp/Makefile.am
+--- faad2/Makefile.am 2004-02-06 17:04:39.000000000 +0100
++++ faad2.cp/Makefile.am 2006-07-31 22:44:34.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ EXTRA_DIST = faad2.spec
+
+-rpm: Makefile
+- make dist
+- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
+- rm $(PACKAGE)-$(VERSION).tar.gz
++rpm: Makefile
++ make dist
++ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
++ rm $(PACKAGE)-$(VERSION).tar.gz
diff --git a/database/hk_classes/BUILD b/database/hk_classes/BUILD
old mode 100644
new mode 100755
diff --git a/database/hk_classes/DETAILS b/database/hk_classes/DETAILS
index 5b07776..f4dc114 100755
--- a/database/hk_classes/DETAILS
+++ b/database/hk_classes/DETAILS
@@ -1,6 +1,5 @@
SPELL=hk_classes
- VERSION=0.8.1
- BUILD_API=2
+ VERSION=0.8.2-test2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -11,7 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://hk-classes.SourceForge.net
LICENSE=LGPL
ENTERED=20031021
- UPDATED=20031116
KEYWORDS="database"
SHORT="hk_classes is C++ library for rapid development of database
applications"
cat << EOF
diff --git a/database/hk_classes/HISTORY b/database/hk_classes/HISTORY
index 94a99d6..d997452 100755
--- a/database/hk_classes/HISTORY
+++ b/database/hk_classes/HISTORY
@@ -1,3 +1,6 @@
+2006-08-01 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.8.2-test2
+
2006-04-21 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.8.1
* PRE_BUILD fb2.diff.bz2: deleted
diff --git a/database/knoda/DETAILS b/database/knoda/DETAILS
index 889383a..1fe4f5e 100755
--- a/database/knoda/DETAILS
+++ b/database/knoda/DETAILS
@@ -1,6 +1,5 @@
SPELL=knoda
- VERSION=0.8.1
- BUILD_API=2
+ VERSION=0.8.2-test2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -11,7 +10,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://$SPELL.SourceForge.net
LICENSE=LGPL
ENTERED=20031021
- UPDATED=20031116
KEYWORDS="database kde"
SHORT="knoda is a database frontend for KDE"
cat << EOF
diff --git a/database/knoda/HISTORY b/database/knoda/HISTORY
index b22b587..7721768 100755
--- a/database/knoda/HISTORY
+++ b/database/knoda/HISTORY
@@ -1,3 +1,6 @@
+2006-08-01 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.8.2-test2
+
2006-04-21 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.8.1

diff --git a/graphics/dcraw/DETAILS b/graphics/dcraw/DETAILS
index 7be26de..93faedc 100755
--- a/graphics/dcraw/DETAILS
+++ b/graphics/dcraw/DETAILS
@@ -1,15 +1,14 @@
SPELL=dcraw
- VERSION=1.323
+ VERSION=1.337
SOURCE=dcraw.c
SOURCE2=dcraw.1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/dcraw-$VERSION
SOURCE_URL[0]=http://www.cybercom.net/~dcoffin/dcraw/dcraw.c
SOURCE2_URL[0]=http://www.cybercom.net/~dcoffin/dcraw/dcraw.1
-
SOURCE_HASH=sha512:6abd889aedb5fe83570b5fad3f605bd2522e2576ad354bd89a7584dffd144a13108e8a346f792bb383b17d04611b6bb2ed70256a02514547fd15c3187b63fd97
-
SOURCE2_HASH=sha512:d2bd20979ce3cde2520773bce011b91fef64066eb97c1af0a291d84bf74a794f8839fcf84f12b0f60304f04863e2ab4faaf115be8652f5d3296a7b7a5cd5fa1a
+
SOURCE_HASH=sha512:f94dd11e0a38242cd8858a36c7034d14be519cbbf0c63bf7440b4397894d81475ef32e066be60180846ae267c3fefce520c923589a90f3cc73aff3c00badf960
+
SOURCE2_HASH=sha512:38e1ef3984ec5fd999dcf997a9792f598ecc698479c26944efc416354bde2421573ef67c212d44cba6a9e01608988f82527bced6edbb974d351d75b298cf1ea6
WEB_SITE=http://www.cybercom.net/~dcoffin/dcraw/
ENTERED=20041112
- UPDATED=20041112
LICENSE[0]=PD
KEYWORDS="images graphics"
SHORT="Handles decoding of raw images from digital cameras."
diff --git a/graphics/dcraw/HISTORY b/graphics/dcraw/HISTORY
index 037d2d5..a6647e6 100644
--- a/graphics/dcraw/HISTORY
+++ b/graphics/dcraw/HISTORY
@@ -1,3 +1,6 @@
+2006-07-31 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.337
+
2006-04-25 Flavien Bridault <vlaaad AT sourcemage.org>
* DEPENDS: added lcms

diff --git a/video-libs/quicktime4linux/BUILD
b/video-libs/quicktime4linux/BUILD
index 2286f25..86c3780 100755
--- a/video-libs/quicktime4linux/BUILD
+++ b/video-libs/quicktime4linux/BUILD
@@ -1,15 +1,2 @@
-invoke_gcc
-patch -p0 < $SCRIPT_DIRECTORY/gcc-3.4.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
-
-sedit "s/-msse/$CFLAGS/" Makefile.ffmpeg &&
-if ! echo $CFLAGS | grep -q -- "-msse"; then
- echo "#undef HAVE_BUILTIN_VECTOR" >> \
- ffmpeg-0.4.8/libavcodec/dsputil.h
-fi &&
-if ! echo $CFLAGS | grep -q -- "-O."; then
- CFLAGS="$CFLAGS -O2"
-fi &&
-sedit "s:quicktime/ffmpeg:ffmpeg:" configure &&
./configure &&
make
diff --git a/video-libs/quicktime4linux/DEPENDS
b/video-libs/quicktime4linux/DEPENDS
index 0a54cd2..8c26599 100755
--- a/video-libs/quicktime4linux/DEPENDS
+++ b/video-libs/quicktime4linux/DEPENDS
@@ -1,6 +1,14 @@
-depends gcc34 &&
+depends yasm &&
+if [ `arch` == i686 ];then
+ depends nasm
+fi &&
depends libmpeg3 &&
depends libraw1394 &&
+depends ffmpeg-svn &&
+depends faac &&
+depends faad2 &&
+depends x264 &&
+depends libogg &&
depends libvorbis &&
depends lame &&
depends libdv &&
diff --git a/video-libs/quicktime4linux/DETAILS
b/video-libs/quicktime4linux/DETAILS
index f6d40d8..f425a93 100755
--- a/video-libs/quicktime4linux/DETAILS
+++ b/video-libs/quicktime4linux/DETAILS
@@ -1,14 +1,12 @@
SPELL=quicktime4linux
- VERSION=2.0.4
+ VERSION=2.2
+
SOURCE_HASH=sha512:4fe6f2dd4810de1877590827ed37bae746229d5e696ccc8d6fda7c46a251b6e22e85054771da598d3d5b0721fa7d261db4db3c514d359da8319ddb98b18f18a5
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/heroines/$SOURCE
WEB_SITE=http://heroinewarrior.com
-
SOURCE_HASH=sha512:777c1ce12038a5ea4e99b3e972d96ecbab418bfc6944ef67d851e90a0d2057077d27ac282d6720b3d3f86b20cfc5e3a4376e78a4f119c05ed2003449d2697866
LICENSE[0]=LGPL
ENTERED=20030425
- UPDATED=20030425
- GCC_VERSION=3.4
KEYWORDS="video libs"
SHORT="Access uncompressed Quicktime movies on Linux the easy way"
cat << EOF
diff --git a/video-libs/quicktime4linux/HISTORY
b/video-libs/quicktime4linux/HISTORY
index b5be2be..57c2e59 100644
--- a/video-libs/quicktime4linux/HISTORY
+++ b/video-libs/quicktime4linux/HISTORY
@@ -1,3 +1,16 @@
+2006-07-30 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 2.2
+ remove GG_VERSION
+ * DEPENDS: remove gcc34, add yasm, libogg, x264, ffmpeg-svn, faad2
+ add nasm for i686
+ * BUILD: disable most edits and patches
+ * PRE_BUILD: apply mk.diff
+ remove included packages
+ * mk.diff: added
+ almost all libraries are now included from the system
+ fix gcc warning in rechunk.c
+ adjust qth264.c to latest x264
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video-libs/quicktime4linux/Makefile.patch
b/video-libs/quicktime4linux/Makefile.patch
deleted file mode 100644
index 7ff6bb5..0000000
--- a/video-libs/quicktime4linux/Makefile.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- Makefile.orig 2004-08-31 19:51:06.000000000 +0200
-+++ Makefile 2004-08-31 21:34:01.870761570 +0200
-@@ -52,11 +52,7 @@
-
-
-
--include Makefile.jpeg
--include Makefile.vorbis
- include Makefile.ffmpeg
--include Makefile.lame
--include Makefile.dv
- include Makefile.encore50
- include Makefile.faad
- include Makefile.faac
-@@ -71,7 +67,9 @@
- CFLAGS += -I. \
- -I$(JPEG_DIR) \
- -I$(MPEG3_DIR) \
-- -I$(LAME_DIR)/include
-+ -I$(LAME_DIR)/include \
-+ -I/usr/include/libmpeg3 \
-+ -I/usr/include/lame
-
-
- # $(OBJDIR)/div3.o \
-@@ -109,7 +107,6 @@
- $(OBJDIR)/hdlr.o \
- $(OBJDIR)/ima4.o \
- $(OBJDIR)/jpeg.o \
-- $(OBJDIR)/jpeg_old.o \
- $(OBJDIR)/libdv.o \
- $(OBJDIR)/libmjpeg.o \
- $(OBJDIR)/matrix.o \
-@@ -230,7 +227,7 @@
- $(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
-
-
--LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread
-ldl -lm
-+LIBS := $(OUTPUT) -lmpeg3 -lraw1394 -lmp3lame -logg -lvorbis -lvorbisenc
-ldv -ljpeg -lpng -lz -lpthread -ldl -lm
-
-
- $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
-@@ -242,12 +239,14 @@
- $(shell echo $(OBJS) $(DV_OBJS) $(DVMMXOBJS) $(ENCOREMMX_OBJS)
$(JPEG_NASM) $(JPEG_FAIL) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS)
$(FAAD_OBJS) $(FAAC_OBJS) > $(OBJDIR)/objs)
- #$(shell echo $(OBJS) $(DV_OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS)
$(ENCOREMMX_OBJS) $(JPEG_NASM) $(JPEG_FAIL) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS)
$(LAME_OBJS) > $(OBJDIR)/objs)
-
--all: $(OBJDIR) $(OUTPUT)
-+all: $(OBJDIR) $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
-
- #$(OUTPUT): $(DV_OBJS) $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(DECOREMMX_OBJS)
$(ENCOREMMX_OBJS) $(JPEG_NASM) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS)
$(JPEG_FAIL)
- $(OUTPUT): $(DV_OBJS) $(DVMMXOBJ) $(OBJS) $(DVMMXOBJS) $(ENCOREMMX_OBJS)
$(JPEG_NASM) $(FFMPEG_OBJS) $(FFMPEGIA32_OBJS) $(LAME_OBJS) $(FAAD_OBJS)
$(FAAC_OBJS) $(JPEG_FAIL)
- ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
-
-+$(SHAREDOUTPUT): $(OUTPUT)
-+ ld -shared -o $(SHAREDOUTPUT) `cat $(OBJDIR)/objs` $(LIBS)
-
- $(OBJDIR)/qtdump: $(OBJDIR)/dump.o $(OUTPUT)
- $(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(LIBS)
-@@ -284,7 +283,13 @@
- cd .. && \
- tar zcvf quicktime.tar.gz quicktime
-
--install:
-+install: $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
-+ mkdir -p /usr/include/quicktime
-+ mkdir -p /usr/include/quicktime/jpeg
-+ cp quicktime.h qtprivate.h colormodels.h libmjpeg.h libdv.h
/usr/include/quicktime
-+ cp jpeg/jpeglib.h /usr/include/quicktime/jpeg
-+ cp i686/libquicktime.* /usr/lib
-+ ldconfig
- cp $(UTILS) /usr/bin
-
- $(OBJDIR)/dump.o \
diff --git a/video-libs/quicktime4linux/PRE_BUILD
b/video-libs/quicktime4linux/PRE_BUILD
new file mode 100755
index 0000000..aba2171
--- /dev/null
+++ b/video-libs/quicktime4linux/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/mk.diff &&
+# remove included packages
+rm -r libogg* libvorbis* faac* faad2* jpeg ffmpeg* lame* libdv-0* x264* &&
+if make -v | grep -q 3.81; then
+ # fix Makefile to work with make 3.81
+ sedit 's/\\;/;/g' Makefile
+fi
diff --git a/video-libs/quicktime4linux/gcc-3.4.patch
b/video-libs/quicktime4linux/gcc-3.4.patch
deleted file mode 100644
index cd565bd..0000000
--- a/video-libs/quicktime4linux/gcc-3.4.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nur ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c
ffmpeg-0.4.8-fixed/libavcodec/i386/dsputil_mmx.c
---- ffmpeg-0.4.8/libavcodec/i386/dsputil_mmx.c 2003-09-28 17:26:40.000000000
+0200
-+++ ffmpeg-0.4.8-fixed/libavcodec/i386/dsputil_mmx.c 2004-05-22
11:15:22.553438524 +0200
-@@ -29,8 +29,8 @@
- static const uint64_t mm_wone __attribute__ ((aligned(8))) =
0x0001000100010001ULL;
- static const uint64_t mm_wtwo __attribute__ ((aligned(8))) =
0x0002000200020002ULL;
-
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) =
0x0014001400140014ULL;
--static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) =
0x0003000300030003ULL;
-+const uint64_t ff_pw_20 __attribute__ ((aligned(8))) =
0x0014001400140014ULL;
-+const uint64_t ff_pw_3 __attribute__ ((aligned(8))) =
0x0003000300030003ULL;
- static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) =
0x0010001000100010ULL;
- static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) =
0x000F000F000F000FULL;
-
-diff -Nur ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c
ffmpeg-0.4.8-fixed/libavcodec/i386/motion_est_mmx.c
---- ffmpeg-0.4.8/libavcodec/i386/motion_est_mmx.c 2003-09-28
17:26:40.000000000 +0200
-+++ ffmpeg-0.4.8-fixed/libavcodec/i386/motion_est_mmx.c 2004-05-22
11:15:22.565436995 +0200
-@@ -26,7 +26,7 @@
- 0x0002000200020002,
- };
-
--static __attribute__ ((aligned(8), unused)) uint64_t bone=
0x0101010101010101LL;
-+__attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
-
- static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-diff -Nur ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c
ffmpeg-0.4.8-fixed/libavcodec/i386/simple_idct_mmx.c
---- ffmpeg-0.4.8/libavcodec/i386/simple_idct_mmx.c 2003-09-28
17:26:40.000000000 +0200
-+++ ffmpeg-0.4.8-fixed/libavcodec/i386/simple_idct_mmx.c 2004-05-22
11:15:22.582434829 +0200
-@@ -45,8 +45,8 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
-
--static const uint64_t __attribute__((aligned(8))) wm1010=
0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000=
0x0000000000040000ULL;
-+const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-+const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-
- static const int16_t __attribute__((aligned(8))) coeffs[]= {
- 1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
-diff -Nur ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c
ffmpeg-0.4.8-fixed/libavcodec/liba52/resample_mmx.c
---- ffmpeg-0.4.8/libavcodec/liba52/resample_mmx.c 2003-09-28
17:26:40.000000000 +0200
-+++ ffmpeg-0.4.8-fixed/libavcodec/liba52/resample_mmx.c 2004-05-22
11:15:22.590433809 +0200
-@@ -7,10 +7,10 @@
- and it would mean (C / MMX2 / MMX / 3DNOW) versions
- */
-
--static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
-+uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
- static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
--static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
--static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
-+uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
-+uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
-
- static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
- int32_t * f = (int32_t *) _f;
-diff -Nur ffmpeg-0.4.8/libavcodec/libpostproc/postprocess.c
ffmpeg-0.4.8-fixed/libavcodec/libpostproc/postprocess.c
---- ffmpeg-0.4.8/libavcodec/libpostproc/postprocess.c 2003-09-28
17:26:40.000000000 +0200
-+++ ffmpeg-0.4.8-fixed/libavcodec/libpostproc/postprocess.c 2004-05-22
11:15:56.957053596 +0200
-@@ -104,8 +104,8 @@
- //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
-
- #ifdef ARCH_X86
--static uint64_t __attribute__((aligned(8))) w05=
0x0005000500050005LL;
--static uint64_t __attribute__((aligned(8))) w20=
0x0020002000200020LL;
-+uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
-+uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
- static uint64_t __attribute__((aligned(8))) b00=
0x0000000000000000LL;
- static uint64_t __attribute__((aligned(8))) b01=
0x0101010101010101LL;
- static uint64_t __attribute__((aligned(8))) b02=
0x0202020202020202LL;
-
diff --git a/video-libs/quicktime4linux/mk.diff
b/video-libs/quicktime4linux/mk.diff
new file mode 100644
index 0000000..f897fe6
--- /dev/null
+++ b/video-libs/quicktime4linux/mk.diff
@@ -0,0 +1,386 @@
+diff -uNr quicktime4linux-2.2/configure quicktime4linux-2.2.cp/configure
+--- quicktime4linux-2.2/configure 2005-08-31 06:02:31.000000000 +0200
++++ quicktime4linux-2.2.cp/configure 2006-08-01 13:03:32.000000000 +0200
+@@ -53,23 +53,7 @@
+
+ # configure them all
+
+-# version 2.0 of faad2 produced defective Makefile
+-cd faad2* && ./configure && sed 's/ /\t/' Makefile > Makefile2 && mv
-f Makefile2 Makefile && cd ..
+-
+-cd faac* && ./configure && cd ..
+-
+-cd ffmpeg* && ./configure && cd ..
+-
+-cd x264* && ./configure --enable-pthread && cd ..
+-
+-cd libdv* && ./configure --disable-gtk --enable-shared=no && cd ..
+-
+-cd libogg* && ./configure && cd ..
+-
+-LIBOGG_PATH=`expr libogg*` && \
+-cd libvorbis* && \
+-CFLAGS="-I../../$LIBOGG_PATH/include -L../../$LIBOGG_PATH/src/" ./configure
--enable-shared=no&& \
+-cd ..
++#cd faac* && ./configure && cd ..
+
+
+
+diff -uNr quicktime4linux-2.2/Makefile quicktime4linux-2.2.cp/Makefile
+--- quicktime4linux-2.2/Makefile 2006-06-11 04:41:39.000000000 +0200
++++ quicktime4linux-2.2.cp/Makefile 2006-08-01 14:38:09.000000000 +0200
+@@ -17,52 +17,13 @@
+ #DECORE_DIR := decore50
+ ENCORE_INCLUDE := $(ENCORE_DIR)/encore.h
+ #DECORE_INCLUDE := $(DECORE_DIR)/decore.h
+-MPEG3_DIR := $(shell expr ../libmpeg3* )
+ OBJS :=
+
+
+-# bug fixes for ffmpeg are required
+-# Add test to ffmpeg/libavcodec/svq3.c to make sure extradata is
+-# nonzero before memcmping it.
+-FFMPEG_DIR := $(shell expr ffmpeg*)
+-FFMPEG_LIB := $(OBJDIR)/ffmpeg/
+-FFMPEG_INCLUDE := -I$(FFMPEG_DIR)/libavcodec -I$(FFMPEG_DIR)/libavutil
+-
+-FAAD_DIR := faad2-2.0
+-FAAD_LIB := $(OBJDIR)/faad/
+-FAAD_INCLUDE := $(FAAD_DIR)/include/
+-
+-FAAC_DIR := faac-1.24
+-FAAC_LIB := $(OBJDIR)/faac/
+-FAAC_INCLUDE := $(FAAC_DIR)/include/
+-
+-X264_DIR := $(shell expr x264*)
+-X264_LIB := $(OBJDIR)/x264
+-X264_INCLUDE := $(X264_DIR)
+-
+-DV_DIR := libdv-0.104
+-DV_LIB := $(OBJDIR)/libdv
+-DV_INCLUDE := $(DV_DIR)
+-
+-OGG_DIR := $(shell expr libogg* )
+-OGG_LIB := $(OBJDIR)/ogg
+-
+-VORBIS_DIR := $(shell expr libvorbis* )
+-VORBIS_LIB := $(OBJDIR)/vorbis
+-
+ ifeq ($(OBJDIR), i686)
+
+ JPEG_DIR := $(shell expr jpeg-mmx* )
+- JPEG_LIB := $(OBJDIR)/jpeg
+ JPEG_LIB2 := $(JPEG_DIR)/libjpeg-mmx.a
+- JPEG_INCLUDE := $(JPEG_DIR)
+-
+-else
+-
+- JPEG_DIR := jpeg
+- JPEG_LIB := $(OBJDIR)/jpeg
+- JPEG_LIB2 := $(JPEG_DIR)/libjpeg.a
+- JPEG_INCLUDE := $(JPEG_DIR)
+
+ endif
+
+@@ -92,27 +53,13 @@
+
+
+
+-#include Makefile.jpeg
+-#include Makefile.vorbis
+-include Makefile.lame
+-#include Makefile.dv
+ include Makefile.encore50
+
+-
+-
+-
+-
+-#CFLAGS += -g
+ CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS += -DHAVE_FIREWIRE
+
+
+
+-
+-
+-
+-
+-
+ OBJS += \
+ $(OBJDIR)/atom.o \
+ $(OBJDIR)/avcc.o \
+@@ -204,23 +151,19 @@
+
+
+
+-OUTPUT = $(OBJDIR)/libquicktime.a
+-SHAREDOUTPUT = $(OBJDIR)/libquicktime.so
++OUTPUT = libquicktime.so
+
+ CFLAGS += \
+ -I. \
+ -I$(ENCORE_DIR) \
+- -I$(FAAC_INCLUDE) \
+- -I$(FAAD_INCLUDE) \
+- $(FFMPEG_INCLUDE) \
++ -I/usr/include/ffmpeg \
+ -DENCORE_INCLUDE=\"$(ENCORE_INCLUDE)\" \
+- -I$(X264_INCLUDE) \
+- -I$(DV_INCLUDE) \
+- -I$(JPEG_INCLUDE) \
+- -I$(MPEG3_DIR) \
+- -I$(LAME_DIR)/include \
+- -I$(OGG_DIR)/include \
+- -I$(VORBIS_DIR)/include \
++ -I/usr/include/libdv \
++ -I/usr/include \
++ -I/usr/include/libmpeg3 \
++ -I/usr/include/lame \
++ -I/usr/include/ogg \
++ -I/usr/include/vorbis \
+ -ffast-math \
+ -mno-ieee-fp
+
+@@ -242,102 +185,44 @@
+ $(OBJDIR)/$(ENCORE_DIR)/mbtransquant/intel_mmx
+
+
+-LIBS := $(OUTPUT) $(MPEG3_DIR)/$(OBJDIR)/libmpeg3.a -lpng -lz -lpthread
-ldl -lm
++LIBS := -lmpeg3 -lraw1394 -lmp3lame -logg -lvorbis -lvorbisenc -ldv -ljpeg
-lpng \
++ -lx264 -lavcodec -lfaad -lfaac -lz -lpthread -ldl -lm
+
++QTLINK := $(LIBS) -L. -lquicktime
+
+ $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
+ $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(LAME_CFLAGS) > $(OBJDIR)/lame_flags)
+-$(shell echo $(OBJS) $(JPEG_LIB)/*.o $(DV_LIB)/*.o $(FAAD_LIB)/*.o
$(FAAC_LIB)/*.o $(FFMPEG_LIB)/*.o $(X264_LIB)/*.o $(OGG_LIB)/*.o
$(VORBIS_LIB)/*.o $(LAME_OBJS) > $(OBJDIR)/objs)
++$(shell echo $(OBJS) > $(OBJDIR)/objs)
++
++all: $(OBJDIR) $(OUTPUT) $(UTILS)
++
++$(OUTPUT): $(OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM)
++ ld -shared -o $(OUTPUT) `cat $(OBJDIR)/objs` $(LIBS)
++
+
+-all: $(OBJDIR) $(OUTPUT)
++$(OBJDIR)/qtdump: $(OBJDIR)/dump.o
++ $(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(QTLINK)
+
+-$(OUTPUT): $(OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB)
$(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB)/
$(VORBIS_LIB)
+- ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
++$(OBJDIR)/make_streamable: $(OBJDIR)/make_streamable.o
++ $(CC) -o $(OBJDIR)/make_streamable $(OBJDIR)/make_streamable.o
$(QTLINK)
+
+-# this is the only way we figured out to merge .a files
+-$(FFMPEG_LIB):
+- $(MAKE) -C $(FFMPEG_DIR) && \
+- mkdir -p $(FFMPEG_LIB) && \
+- cd $(FFMPEG_LIB) && \
+- ar x ../../$(FFMPEG_DIR)/libavcodec/libavcodec.a && \
+- ar x ../../$(FFMPEG_DIR)/libavutil/libavutil.a
+-
+-$(FAAD_LIB):
+- $(MAKE) -C $(FAAD_DIR) && \
+- mkdir -p $(FAAD_LIB) && \
+- cd $(FAAD_LIB) && \
+- ar x ../../$(FAAD_DIR)/libfaad/.libs/libfaad.a
+-
+-$(FAAC_LIB):
+- $(MAKE) -C $(FAAC_DIR) && \
+- mkdir -p $(FAAC_LIB) && \
+- cd $(FAAC_LIB) && \
+- ar x ../../$(FAAC_DIR)/libfaac/.libs/libfaac.a
+-
+-$(DV_LIB):
+- $(MAKE) -C $(DV_DIR) && \
+- mkdir -p $(DV_LIB) && \
+- cd $(DV_LIB) && \
+- ar x ../../$(DV_DIR)/libdv/.libs/libdv.a
+-
+-$(JPEG_LIB):
+- $(MAKE) -C $(JPEG_DIR) && \
+- mkdir -p $(JPEG_LIB) && \
+- cd $(JPEG_LIB) && \
+- ar x ../../$(JPEG_LIB2)
+-
+-# need some trickery to get the duplicated filenames out
+-$(X264_LIB):
+- $(MAKE) -C $(X264_DIR) && \
+- mkdir -p $(X264_LIB) && \
+- cd $(X264_LIB) && \
+- ar x ../../$(X264_DIR)/libx264.a && \
+- mv predict.o predict2.o && \
+- mv cabac.o cabac2.o && \
+- mv macroblock.o macroblock2.o && \
+- mv set.o set2.o && \
+- ar xN 1 ../../$(X264_DIR)/libx264.a predict.o cabac.o macroblock.o
set.o
+-
+-$(OGG_LIB):
+- $(MAKE) -C $(OGG_DIR) && \
+- mkdir -p $(OGG_LIB) && \
+- cd $(OGG_LIB) && \
+- ar x ../../$(OGG_DIR)/src/.libs/libogg.a
+-
+-$(VORBIS_LIB):
+- $(MAKE) -C $(VORBIS_DIR) && \
+- mkdir -p $(VORBIS_LIB) && \
+- cd $(VORBIS_LIB) && \
+- ar x ../../$(VORBIS_DIR)/lib/.libs/libvorbis.a && \
+- ar x ../../$(VORBIS_DIR)/lib/.libs/libvorbisenc.a && \
+- ar x ../../$(VORBIS_DIR)/lib/.libs/libvorbisfile.a
+-
+-
+-
+-$(OBJDIR)/qtdump: $(OBJDIR)/dump.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/qtdump $(OBJDIR)/dump.o $(LIBS)
+-
+-$(OBJDIR)/make_streamable: $(OBJDIR)/make_streamable.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/make_streamable $(OBJDIR)/make_streamable.o $(LIBS)
+-
+-$(OBJDIR)/dechunk: $(OBJDIR)/dechunk.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/dechunk $(OBJDIR)/dechunk.o $(LIBS)
+-
+-$(OBJDIR)/rechunk: $(OBJDIR)/rechunk.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/rechunk $(OBJDIR)/rechunk.o $(LIBS)
++$(OBJDIR)/dechunk: $(OBJDIR)/dechunk.o
++ $(CC) -o $(OBJDIR)/dechunk $(OBJDIR)/dechunk.o $(QTLINK)
+
+-$(OBJDIR)/recover: $(OBJDIR)/recover.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/recover $(OBJDIR)/recover.o $(LIBS)
++$(OBJDIR)/rechunk: $(OBJDIR)/rechunk.o
++ $(CC) -o $(OBJDIR)/rechunk $(OBJDIR)/rechunk.o $(QTLINK)
+
+-$(OBJDIR)/yuv4toyuv: $(OBJDIR)/yuv4toyuv.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/yuv4toyuv $(OBJDIR)/yuv4toyuv.o $(LIBS)
++$(OBJDIR)/recover: $(OBJDIR)/recover.o
++ $(CC) -o $(OBJDIR)/recover $(OBJDIR)/recover.o $(QTLINK)
+
+-$(OBJDIR)/yuv2mov: $(OBJDIR)/yuv2mov.o $(OUTPUT)
+- $(CC) -o $(OBJDIR)/yuv2mov $(OBJDIR)/yuv2mov.o $(LIBS)
++$(OBJDIR)/yuv4toyuv: $(OBJDIR)/yuv4toyuv.o
++ $(CC) -o $(OBJDIR)/yuv4toyuv $(OBJDIR)/yuv4toyuv.o $(QTLINK)
++
++$(OBJDIR)/yuv2mov: $(OBJDIR)/yuv2mov.o
++ $(CC) -o $(OBJDIR)/yuv2mov $(OBJDIR)/yuv2mov.o $(QTLINK)
+
+ $(OBJDIR)/qtinfo: $(OBJDIR)/qtinfo.o
+- $(CC) -o $(OBJDIR)/qtinfo $(OBJDIR)/qtinfo.o $(LIBS)
++ $(CC) -o $(OBJDIR)/qtinfo $(OBJDIR)/qtinfo.o $(QTLINK)
+
+ util: $(UTILS)
+
+@@ -352,24 +237,11 @@
+ -o -name '*.so' \) -exec rm -f {} \; -prune
+ find \( -name $(OBJDIR) \) -exec rm -rf {} \; -prune
+ # find \( -name .deps \) -exec rm -rf {} \; -prune
+- make -i -C $(FFMPEG_DIR) clean
+- make -i -C $(FAAD_DIR) clean
+- make -i -C $(FAAC_DIR) clean
+- make -i -C $(FAAD_DIR) clean
+- make -i -C $(X264_DIR) clean
+- make -i -C $(DV_DIR) clean
+- make -i -C $(OGG_DIR) clean
+- make -i -C $(VORBIS_DIR) clean
+- make -i -C $(JPEG_DIR) clean
+-
+-wc:
+- cat *.c *.h | wc
+-
+-backup: clean
+- cd .. && \
+- tar zcvf quicktime.tar.gz quicktime
+
+-install:
++install: $(OUTPUT) $(UTILS)
++ mkdir -p /usr/include/quicktime
++ cp quicktime.h qtprivate.h colormodels.h libmjpeg.h
/usr/include/quicktime
++ cp $(OUTPUT) /usr/lib
+ cp $(UTILS) /usr/bin
+
+ $(OBJDIR)/dump.o \
+@@ -386,21 +258,7 @@
+ $(JPEG_FAIL):
+ $(CC) -c -O3 -march=i686 -fmessage-length=0 $(subst $(OBJDIR)/,,
$*.c) -o $*.o
+
+-$(DV_OBJS):
+- $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+-
+-#$(FAAD_OBJS):
+-# $(CC) -c `cat $(OBJDIR)/faad_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+
+-#$(FAAC_OBJS):
+-# $(CC) -c `cat $(OBJDIR)/faac_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+-
+-$(DVMMXOBJS):
+- $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
+-
+-$(DVMMXOBJ): $(DV_DIR)/libdv/gasmoff.c
+- $(CC) `cat $(OBJDIR)/c_flags` $(DV_DIR)/libdv/gasmoff.c -o
$(OBJDIR)/$(DV_DIR)/libdv/gasmoff -lm
+- $(OBJDIR)/$(DV_DIR)/libdv/gasmoff > $(DVMMXOBJ)
+
+ $(JPEG_NASM):
+ nasm -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+@@ -412,16 +270,6 @@
+ # $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
+
+
+-#$(FFMPEG_OBJS) $(FFMPEGIA32_OBJS):
+-# $(CC) `cat $(OBJDIR)/ffmpeg_flags` -c $(subst $(OBJDIR)/,, $*.c) -o
$*.o
+-
+-$(LAME_OBJS):
+- $(CC) `cat $(OBJDIR)/lame_flags` -c $(subst $(OBJDIR)/,, $*.c) -o $*.o
+-
+-#$(FFMPEGIA32_OBJS):
+-# nasm -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+-
+-
+
+
+ #$(OBJDIR)/div3.o: div3.c
+@@ -553,11 +401,4 @@
+
+
+
+-#include depend.vorbis
+-#include depend.ffmpeg
+-#include depend.jpeg
+-include depend.lame
+-#include depend.dv
+ include depend.encore50
+-#include depend.faad
+-#include depend.faac
+diff -uNr quicktime4linux-2.2/qth264.c quicktime4linux-2.2.cp/qth264.c
+--- quicktime4linux-2.2/qth264.c 2006-05-30 08:57:46.000000000 +0200
++++ quicktime4linux-2.2.cp/qth264.c 2006-07-31 19:20:03.000000000 +0200
+@@ -138,7 +138,8 @@
+ x264_param_t default_params;
+ x264_param_default(&default_params);
+ // Reset quantizer if fixed bitrate
+- if(codec->param.rc.b_cbr)
++// if(codec->param.rc.b_cbr)
++ if(codec->param.rc.i_rc_method == X264_RC_ABR)
+ {
+ codec->param.rc.i_qp_constant =
default_params.rc.i_qp_constant;
+ codec->param.rc.i_qp_min = default_params.rc.i_qp_min;
+@@ -471,7 +472,8 @@
+ }
+ else
+ if(!strcasecmp(key, "h264_fix_bitrate"))
+- codec->param.rc.b_cbr = (*(int*)value) / 1000;
++// codec->param.rc.b_cbr = (*(int*)value) / 1000;
++ codec->param.rc.i_bitrate = (*(int*)value) / 1000;
+ }
+ }
+
+diff -uNr quicktime4linux-2.2/rechunk.c quicktime4linux-2.2.cp/rechunk.c
+--- quicktime4linux-2.2/rechunk.c 2005-04-21 05:59:36.000000000 +0200
++++ quicktime4linux-2.2.cp/rechunk.c 2006-07-31 18:41:12.000000000 +0200
+@@ -1,5 +1,6 @@
+ #include "funcprotos.h"
+ #include "quicktime.h"
++#include <string.h>
+
+ int usage(void)
+ {
diff --git a/video-libs/x264/BUILD b/video-libs/x264/BUILD
new file mode 100755
index 0000000..3aac651
--- /dev/null
+++ b/video-libs/x264/BUILD
@@ -0,0 +1,4 @@
+rm -r doc/.svn &&
+OPTS="--enable-shared $OPTS" &&
+default_build
+
diff --git a/video-libs/x264/DEPENDS b/video-libs/x264/DEPENDS
new file mode 100755
index 0000000..5197409
--- /dev/null
+++ b/video-libs/x264/DEPENDS
@@ -0,0 +1,3 @@
+depends nasm &&
+optional_depends "gtk+2" "--enable-gtk" "--disable-gtk" "build gui frontend"
+
diff --git a/video-libs/x264/DETAILS b/video-libs/x264/DETAILS
new file mode 100755
index 0000000..f3d9cf4
--- /dev/null
+++ b/video-libs/x264/DETAILS
@@ -0,0 +1,29 @@
+ SPELL=x264
+ VERSION=20060730-2245
+
SOURCE_HASH=sha512:b5d181917d18f73a7377e735586f3c07a0bae513e5684179e0dcc26561a87fafbfa52dc0831ee1119b6c7b9c69e62345053bc0f355137263ad7134375665b395
+ SOURCE=$SPELL-snapshot-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-snapshot-$VERSION
+ SOURCE_URL[0]=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/$SOURCE
+ WEB_SITE=http://developers.videolan.org/x264.html
+ LICENSE[0]=GPL
+ ENTERED=20060731
+ KEYWORDS="h264 video"
+ SHORT="a free library for encoding H264/AVC video streams."
+cat << EOF
+x264 is a free library for encoding H264/AVC video streams.
+
+Encoder features
+CAVLC/CABAC
+Multi-references
+Intra: all macroblock types (16x16, 8x8, and 4x4 with all predictions)
+Inter P: all partitions (from 16x16 down to 4x4)
+Inter B: partitions from 16x16 down to 8x8 (including skip/direct)
+Ratecontrol: constant quantizer, single or multipass ABR, optional VBV
+Scene cut detection
+Adaptive B-frame placement
+B-frames as references / arbitrary frame order
+8x8 and 4x4 adaptive spatial transform
+Lossless mode
+Custom quantization matrices
+Parallel encoding of multiple slices
+EOF
diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY
new file mode 100644
index 0000000..fc6b4b8
--- /dev/null
+++ b/video-libs/x264/HISTORY
@@ -0,0 +1,4 @@
+2006-07-30 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 20060730-2245
+ spell created
+




Archive powered by MHonArc 2.6.24.

Top of Page