Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz (d64fb469be3b844bb0b39969465847adfa9269fc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz (d64fb469be3b844bb0b39969465847adfa9269fc)
  • Date: Sat, 17 Jun 2006 10:35:52 -0500

GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

dev/null |binary
disk/arson/DEPENDS | 2
disk/arson/HISTORY | 4
disk/audio_burn/DEPENDS | 4
disk/audio_burn/HISTORY | 4
disk/bashburn/DEPENDS | 2
disk/bashburn/HISTORY | 4
disk/burncenter/DEPENDS | 2
disk/burncenter/HISTORY | 4
disk/gnomebaker/HISTORY | 5
disk/gnomebaker/PRE_BUILD | 5
disk/gnomebaker/dvdrtools.patch | 19 ++
disk/graveman/DEPENDS | 3
disk/graveman/DETAILS | 2
disk/graveman/HISTORY | 8 +
disk/graveman/graveman-0.3.12-4.tar.bz2.sig |binary
disk/hfsutils/HISTORY | 4
disk/hfsutils/PRE_BUILD | 3
disk/hfsutils/glibc.patch | 72 +++++++++++
disk/xcdroast/DEPENDS | 2
disk/xcdroast/HISTORY | 4
disk/yaboot/DETAILS | 6
disk/yaboot/HISTORY | 3
video/drip/DEPENDS | 2
video/drip/DETAILS | 1
video/drip/HISTORY | 6
video/ffmpeg-cvs/BUILD | 15 --
video/ffmpeg-cvs/DEPENDS | 34 -----
video/ffmpeg-cvs/DETAILS | 22 ++-
video/ffmpeg-cvs/EXPORTS | 1
video/ffmpeg-cvs/HISTORY | 28 ++++
video/ffmpeg-cvs/INSTALL | 16 --
video/ffmpeg-cvs/PREPARE | 1
video/ffmpeg-cvs/PRE_BUILD | 4
video/ffmpeg-cvs/PROVIDES | 1
video/ffmpeg-cvs/REPAIR^none^EXPORTS | 1
video/ffmpeg-cvs/TRIGGERS | 1
video/ffmpeg-cvs/bswap-fix.patch | 10 -
video/ffmpeg-svn/BUILD | 13 ++
video/ffmpeg-svn/CONFLICTS | 2
video/ffmpeg-svn/DEPENDS | 37 +++++
video/ffmpeg-svn/DETAILS | 23 +++
video/ffmpeg-svn/DOWNLOAD | 43 ++++++
video/ffmpeg-svn/HISTORY | 182
++++++++++++++++++++++++++++
video/ffmpeg-svn/INSTALL | 5
video/ffmpeg-svn/PREPARE | 2
video/ffmpeg-svn/PROVIDES | 1
video/kaffeine/DETAILS | 5
video/kaffeine/HISTORY | 10 +
video/kaffeine/kaffeine-0.8.1.tar.bz2.sig |binary
video/mlt/DEPENDS | 2
video/mlt/HISTORY | 3
video/mplayer/BUILD | 5
video/mplayer/CONFIGURE | 2
video/mplayer/DEPENDS | 14 --
video/mplayer/DETAILS | 13 +-
video/mplayer/DOWNLOAD | 47 +++++++
video/mplayer/HISTORY | 27 ++++
video/mplayer/PREPARE | 16 +-
video/mplayer/PRE_BUILD | 5
video/mplayer/mplayer_20060519.tar.bz2.sig |binary
video/mplayer/patch-CVE-2006-1502 | 69 ++++++++++
video/mythtv/BUILD | 2
video/mythtv/HISTORY | 3
video/tcvp/DEPENDS | 2
video/tcvp/HISTORY | 3
video/vobcopy/BUILD | 2
video/vobcopy/DETAILS | 3
video/vobcopy/HISTORY | 7 +
video/vobcopy/vobcopy-0.5.16.tar.bz2.sig | 0
video/vobcopy/vobcopy-1.0.0.tar.bz2.sig |binary
video/xvattr/HISTORY | 3
video/xvattr/INSTALL | 5
73 files changed, 733 insertions(+), 128 deletions(-)

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

yaboot: sync from svk

commit 71956730044c758b4f7c5792fb99aeff7063c815
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

xcdroast: sync from svk

commit 7c86d9093147f2617891788b58ced0cb8dfe4726
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

hfsutils: sync from svk

commit 745ea737131aad2c2d3513dca613ed3172d67433
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

graveman: sync from svk

commit 9a7a54eb604bb4e781c1eeefb441c1269d974bed
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

gnomebaker: sync from svk

commit c37bea93efaeb0549fd935e4059b4ae5f4bf6dd8
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

burncenter: sync from svk

commit 7e556f7429f633894e77abb0c6eb2006c024be60
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

bashburn: sync from svk

commit eb5dd25f15f610e402710168f23e4a12917e9e00
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

audio_burn: sync from svk

commit a98fbf446805bd237247fc59a1d9e0f58f6e30c2
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

arson: sync from svk

commit ae33fb8be352cd179aaa4dcf5170de77c30a5c5f
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

xvattr: sync from svk

commit 9379bd75d7314ffb1f5b64c1fdc61431fa2fdf46
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

vobcopy: sync from svk

commit 74e87f2cf1d2aa126ecc5980077dbebf2778462d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

tcvp: sync from svk

commit a10b582e785880b6959d0355fcf7ad4bc8a8311d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mythtv: sync from svk

commit 62d67b36ec2c9044fe0af6d0761ecda55b1f7565
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mplayer: sync from svk

commit 629504aef16b5d88cb3bd36add33297054de7668
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mlt: sync from svk

commit 6f5d0058830920a070c6fd957df32ac42352a3a5
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

kaffeine: sync from svk

commit e430236e7938f74d5c0369504e7f5dbbf33eaeab
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: sync from svk

commit c631fab6eb468ef3c05a3105e5acf844624c381c
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ffmpeg-cvs: sync from svk

commit 7274f75958f05788a4478dba884b6b7b8092adbc
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

drip: sync from svk

diff --git a/disk/arson/DEPENDS b/disk/arson/DEPENDS
index b68f0e4..fdb911f 100755
--- a/disk/arson/DEPENDS
+++ b/disk/arson/DEPENDS
@@ -1,4 +1,4 @@
-depends CD-BURN-UTILITY &&
+depends cdrtools &&
depends qt-x11 &&
depends kdelibs &&
depends cdrdao &&
diff --git a/disk/arson/HISTORY b/disk/arson/HISTORY
index 0e8f239..802bb29 100644
--- a/disk/arson/HISTORY
+++ b/disk/arson/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/disk/audio_burn/DEPENDS b/disk/audio_burn/DEPENDS
index 0afa0bc..57a381b 100755
--- a/disk/audio_burn/DEPENDS
+++ b/disk/audio_burn/DEPENDS
@@ -1,5 +1,5 @@
-depends CD-BURN-UTILITY &&
-optional_depends "vorbis-tools" "" "--disable-oggdec" "for ogg/vorbis
support" &&
+depends cdrtools &&
+depends vorbis-tools &&
optional_depends "mpg321" "" "--disable-mpg321" "for mp3 support" &&
optional_depends "sox" "" "--disable-sox" "for resampling support" &&
optional_depends "normalize" "" "--disable-normalize" "for normalize
support"
diff --git a/disk/audio_burn/HISTORY b/disk/audio_burn/HISTORY
index 5f507ef..596b138 100644
--- a/disk/audio_burn/HISTORY
+++ b/disk/audio_burn/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/disk/bashburn/DEPENDS b/disk/bashburn/DEPENDS
index 6b7c422..1f6295b 100755
--- a/disk/bashburn/DEPENDS
+++ b/disk/bashburn/DEPENDS
@@ -1,5 +1,5 @@
depends cdrdao &&
-depends cdrtools &&
+depends CD-BURN-UTILITY &&
depends sed &&
optional_depends "lame" \
"" \
diff --git a/disk/bashburn/HISTORY b/disk/bashburn/HISTORY
index 10e996b..a593a97 100644
--- a/disk/bashburn/HISTORY
+++ b/disk/bashburn/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: replaced cdrtools by CD-BURN-UTILITY, because
+ it works with dvdrtools (bug #10535)
+
2006-02-17 Flavien Bridault <disk AT sourcemage.org>
* DETAILS: updated to 1.7.1, updated SOURCE
* DEPENDS: added dvd+rw-tools
diff --git a/disk/burncenter/DEPENDS b/disk/burncenter/DEPENDS
index 34d7d5f..1572ca5 100755
--- a/disk/burncenter/DEPENDS
+++ b/disk/burncenter/DEPENDS
@@ -1,5 +1,5 @@
depends perl &&
-depends cdrtools &&
+depends CD-BURN-UTILITY &&

optional_depends MPG123 \
"" \
diff --git a/disk/burncenter/HISTORY b/disk/burncenter/HISTORY
index 8191d79..26b0b5f 100644
--- a/disk/burncenter/HISTORY
+++ b/disk/burncenter/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: replaced cdrtools by CD-BURN-UTILITY, because
+ it works with dvdrtools (bug #10535)
+
2005-10-26 Flavien Bridault <disk AT sourcemage.org>
* DETAILS: Updated to 3.2.1, md5->sha512

diff --git a/disk/gnomebaker/HISTORY b/disk/gnomebaker/HISTORY
index 50c40a2..88e7bee 100644
--- a/disk/gnomebaker/HISTORY
+++ b/disk/gnomebaker/HISTORY
@@ -1,3 +1,8 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * dvdrtools.patch: Added to allow the use of dvdrtools, thanks
+ to Pieter Lenaerts
+ * PRE_BUILD: Added to apply patch
+
2006-02-05 Flavien Bridault <disk AT sourcemage.org>
* DETAILS: Updated to 0.5.1

diff --git a/disk/gnomebaker/PRE_BUILD b/disk/gnomebaker/PRE_BUILD
new file mode 100644
index 0000000..5f878a7
--- /dev/null
+++ b/disk/gnomebaker/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+if spell_installed dvdrtools; then
+ patch -p1 < $SPELL_DIRECTORY/dvdrtools.patch
+fi
diff --git a/disk/gnomebaker/dvdrtools.patch b/disk/gnomebaker/dvdrtools.patch
new file mode 100644
index 0000000..181f7f9
--- /dev/null
+++ b/disk/gnomebaker/dvdrtools.patch
@@ -0,0 +1,19 @@
+diff -urNp gnomebaker-0.5.1.orig/src/execfunctions.c
gnomebaker-0.5.1/src/execfunctions.c
+--- gnomebaker-0.5.1.orig/src/execfunctions.c 2006-05-23 13:37:04.000000000
+0200
++++ gnomebaker-0.5.1/src/execfunctions.c 2006-05-23 13:47:42.000000000
+0200
+@@ -236,7 +236,6 @@ cdrecord_add_common_args(ExecCmd* cdBurn
+ if(preferences_get_bool(GB_CDRECORD_FORCE))
+ exec_cmd_add_arg(cdBurn, "-force");
+
+- exec_cmd_add_arg(cdBurn, "gracetime=5");
+ exec_cmd_add_arg(cdBurn, "speed=%d",
preferences_get_int(GB_CDWRITE_SPEED));
+ exec_cmd_add_arg(cdBurn, "-v");
+
+@@ -385,7 +384,6 @@ cdrecord_add_blank_args(ExecCmd* cdBurn)
+ if(preferences_get_bool(GB_EJECT))
+ exec_cmd_add_arg(cdBurn, "-eject");
+
+- exec_cmd_add_arg(cdBurn, "gracetime=5");
+ exec_cmd_add_arg(cdBurn, "blank=%s",
preferences_get_bool(GB_FAST_BLANK) ? "fast" : "all");
+ }
+
diff --git a/disk/graveman/DEPENDS b/disk/graveman/DEPENDS
index b5880c7..9034118 100755
--- a/disk/graveman/DEPENDS
+++ b/disk/graveman/DEPENDS
@@ -1,4 +1,5 @@
-depends CD-BURN-UTILITY &&
+depends xml-parser-expat &&
+depends cdrtools &&
depends cdrdao &&
depends libmng &&
depends libglade2 &&
diff --git a/disk/graveman/DETAILS b/disk/graveman/DETAILS
index 6a35c84..f6b9a8b 100755
--- a/disk/graveman/DETAILS
+++ b/disk/graveman/DETAILS
@@ -2,7 +2,7 @@
VERSION=0.3.12-4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://graveman.tuxfamily.org/sources/$SOURCE
-
SOURCE_HASH=sha512:9ad23e1c14ba461f105387f3273aa649f8b743bb748a374cbe260e645fcdbbe708b825af0d96e2206114d3d5f9b5c8950a8d140e859adb3f7118f33e3d83b056
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://graveman.tuxfamily.org/
ENTERED=20050304
diff --git a/disk/graveman/HISTORY b/disk/graveman/HISTORY
index b12f411..393484f 100644
--- a/disk/graveman/HISTORY
+++ b/disk/graveman/HISTORY
@@ -1,3 +1,11 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
+2006-05-01 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: added xml-parser-expat (bug #11705)
+ * DETAILS: sha512->GPG
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/disk/graveman/graveman-0.3.12-4.tar.bz2.sig
b/disk/graveman/graveman-0.3.12-4.tar.bz2.sig
new file mode 100644
index 0000000..4b592f7
Binary files /dev/null and b/disk/graveman/graveman-0.3.12-4.tar.bz2.sig
differ
diff --git a/disk/hfsutils/HISTORY b/disk/hfsutils/HISTORY
index 0c6aec8..6db5ee2 100644
--- a/disk/hfsutils/HISTORY
+++ b/disk/hfsutils/HISTORY
@@ -1,3 +1,7 @@
+2006-04-24 Flavien Bridault <vlaaad AT sourcemage.org>
+ * glibc.patch: fix compiling with newest glibc (bug #11254)
+ * PRE_BUILD: apply this patch
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/disk/hfsutils/PRE_BUILD b/disk/hfsutils/PRE_BUILD
new file mode 100755
index 0000000..50222e6
--- /dev/null
+++ b/disk/hfsutils/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/glibc.patch
diff --git a/disk/hfsutils/glibc.patch b/disk/hfsutils/glibc.patch
new file mode 100644
index 0000000..f3f3950
--- /dev/null
+++ b/disk/hfsutils/glibc.patch
@@ -0,0 +1,72 @@
+diff -uNr hfsutils-3.2.6.old/binhex.c hfsutils-3.2.6/binhex.c
+--- hfsutils-3.2.6.old/binhex.c 2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/binhex.c 2006-04-24 17:38:08.000000000 +0200
+@@ -38,8 +38,6 @@
+
+ const char *bh_error = "no error";
+
+-extern int errno;
+-
+ # define ERROR(code, str) (bh_error = (str), errno = (code))
+
+ static FILE *file; /* input/output file */
+diff -uNr hfsutils-3.2.6.old/copyin.c hfsutils-3.2.6/copyin.c
+--- hfsutils-3.2.6.old/copyin.c 2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/copyin.c 2006-04-24 17:38:30.000000000 +0200
+@@ -48,8 +48,6 @@
+
+ const char *cpi_error = "no error";
+
+-extern int errno;
+-
+ # define ERROR(code, str) (cpi_error = (str), errno = (code))
+
+ # define MACB_BLOCKSZ 128
+diff -uNr hfsutils-3.2.6.old/copyout.c hfsutils-3.2.6/copyout.c
+--- hfsutils-3.2.6.old/copyout.c 2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/copyout.c 2006-04-24 17:38:44.000000000 +0200
+@@ -49,8 +49,6 @@
+
+ const char *cpo_error = "no error";
+
+-extern int errno;
+-
+ # define ERROR(code, str) (cpo_error = (str), errno = (code))
+
+ # define MACB_BLOCKSZ 128
+diff -uNr hfsutils-3.2.6.old/hcwd.c hfsutils-3.2.6/hcwd.c
+--- hfsutils-3.2.6.old/hcwd.c 2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/hcwd.c 2006-04-24 17:39:00.000000000 +0200
+@@ -43,8 +43,6 @@
+ static int mtabsz = 0, nmounts = 0;
+ static int curvol = -1, dirty = 0;
+
+-extern int errno;
+-
+ /*
+ * NAME: addent()
+ * DESCRIPTION: insert mount entry into table
+diff -uNr hfsutils-3.2.6.old/hfsutil.h hfsutils-3.2.6/hfsutil.h
+--- hfsutils-3.2.6.old/hfsutil.h 2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/hfsutil.h 2006-04-24 17:40:17.000000000 +0200
+@@ -19,7 +19,7 @@
+ * $Id: hfsutil.h,v 1.8 1998/04/11 08:26:57 rob Exp $
+ */
+
+-extern int errno;
++# include <errno.h>
+
+ # define ERROR(code, str) (hfs_error = (str), errno = (code))
+
+diff -uNr hfsutils-3.2.6.old/tclhfs.c hfsutils-3.2.6/tclhfs.c
+--- hfsutils-3.2.6.old/tclhfs.c 2006-04-24 17:37:44.000000000 +0200
++++ hfsutils-3.2.6/tclhfs.c 2006-04-24 17:40:07.000000000 +0200
+@@ -44,7 +44,7 @@
+ # include "suid.h"
+ # include "version.h"
+
+-extern int errno;
++# include <errno.h>
+
+ # define ERROR(code, str) (hfs_error = (str), errno = (code))
+
diff --git a/disk/xcdroast/DEPENDS b/disk/xcdroast/DEPENDS
index 7d44e72..122bbb3 100755
--- a/disk/xcdroast/DEPENDS
+++ b/disk/xcdroast/DEPENDS
@@ -1,4 +1,4 @@
-depends CD-BURN-UTILITY &&
+depends cdrtools &&
if [ $XCDROAST_GTK2 == "y" ]; then
depends gtk+2
else
diff --git a/disk/xcdroast/HISTORY b/disk/xcdroast/HISTORY
index 9e39b3d..9026f16 100644
--- a/disk/xcdroast/HISTORY
+++ b/disk/xcdroast/HISTORY
@@ -1,3 +1,7 @@
+2006-06-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DEPENDS: doesn't work with dvdrtools, only depends on
+ cdrtools (bug #10535)
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/disk/yaboot/DETAILS b/disk/yaboot/DETAILS
index 268a406..1ef6c8f 100755
--- a/disk/yaboot/DETAILS
+++ b/disk/yaboot/DETAILS
@@ -2,9 +2,9 @@
VERSION=1.3.13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://penguinppc.org/projects/yaboot/$SOURCE
- MD5[0]=f12798d1b2063f21d07e0ae7f602ccaf
- WEB_SITE=http://penguinppc.org/projects/yaboot/
+ SOURCE_URL[0]=http://yaboot.ozlabs.org/releases/$SOURCE
+
SOURCE_HASH[0]=sha512:c98df0ae4d0e744f03fb52af22d8460f1a1e2d0a176630aa22a2a41dacb5dd8b1acb3bef7b8b8ff80843215cd3288bdc73b128e8b0d3f0c6d5a46c975a907b6b
+ WEB_SITE=http://yaboot.ozlabs.org/
ENTERED=20020307
UPDATE=20050127
LICENSE[0]=GPL
diff --git a/disk/yaboot/HISTORY b/disk/yaboot/HISTORY
index d3da111..e519ae6 100644
--- a/disk/yaboot/HISTORY
+++ b/disk/yaboot/HISTORY
@@ -1,3 +1,6 @@
+2006-04-24 Flavien Bridault <disk AT sourcemage.org>
+ * DETAILS: Updated SOURCE_URL[0], WEB_SITE, md5->sha512 (bug #11503)
+
2005-09-30 Eric Sandall <eric AT sandall.us>
* PROVIDES: Yaboot is a BOOTLOADER

diff --git a/video/drip/DEPENDS b/video/drip/DEPENDS
index 53e5838..51bea84 100755
--- a/video/drip/DEPENDS
+++ b/video/drip/DEPENDS
@@ -8,4 +8,6 @@ depends gnome-libs &&
depends gdk-pixbuf &&
depends avifile &&
depends mpeg2dec &&
+depends libxml2 &&
+depends libmad &&
depends imagemagick
diff --git a/video/drip/DETAILS b/video/drip/DETAILS
index 82dd647..92678c3 100755
--- a/video/drip/DETAILS
+++ b/video/drip/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
LICENSE[0]=GPL
BUILD_API=2
GCC_VERSION=3.4
+ KEYWORDS="dvd video"
SHORT="DVD Transcoder for Unix"
cat << EOF
Drip is a DVD to DIVX conversion application. It's made up out two
diff --git a/video/drip/HISTORY b/video/drip/HISTORY
index eadceff..648d7ec 100644
--- a/video/drip/HISTORY
+++ b/video/drip/HISTORY
@@ -1,3 +1,9 @@
+2006-04-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added dependencies on libxml2 and libmad, bug #11569
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/video/ffmpeg-cvs/BUILD b/video/ffmpeg-cvs/BUILD
index fc1d1ec..27ba77d 100755
--- a/video/ffmpeg-cvs/BUILD
+++ b/video/ffmpeg-cvs/BUILD
@@ -1,14 +1 @@
-CFLAGS="${CFLAGS/-funroll-loops/} -O3"
-if [[ "$HOST" != x86_64-* ]]; then
- CFLAGS="${CFLAGS/-DPIC -fPIC/}"
-fi
-
-sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
-sedit 's:-Werror::' libavformat/Makefile &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --enable-shared \
- --enable-pp \
- --enable-gpl \
- $OPTS &&
-make
+true
diff --git a/video/ffmpeg-cvs/DEPENDS b/video/ffmpeg-cvs/DEPENDS
index 99c7d4c..c0d8d7b 100755
--- a/video/ffmpeg-cvs/DEPENDS
+++ b/video/ffmpeg-cvs/DEPENDS
@@ -1,33 +1 @@
-depends CVS &&
-optional_depends "nasm" \
- "" \
- "--disable-mmx" \
- "for MMX support" &&
-optional_depends "lame" \
- "--enable-mp3lame" \
- "" \
- "for mp3 encoding via libmp3lame" &&
-optional_depends "libvorbis" \
- "--enable-libogg --enable-vorbis" \
- "" \
- "for ogg/vorbis support" &&
-optional_depends "faad2" \
- "--enable-faad" \
- "" \
- "for AAC audio support" &&
-optional_depends "imlib2" \
- "" \
- "" \
- "for imlib2 support" &&
-optional_depends "freetype2" \
- "" \
- "" \
- "for a text render plugin" &&
-optional_depends "libdts" \
- "--enable-dts" \
- "" \
- "for DTS audio decoding" &&
-optional_depends "xvid" \
- "--enable-xvid" \
- "" \
- "for xvid support"
+depends ffmpeg-svn
diff --git a/video/ffmpeg-cvs/DETAILS b/video/ffmpeg-cvs/DETAILS
index d62c328..5795f8c 100755
--- a/video/ffmpeg-cvs/DETAILS
+++ b/video/ffmpeg-cvs/DETAILS
@@ -1,18 +1,26 @@
SPELL=ffmpeg-cvs
if test "$FFMPEG_CVS_AUTOUPDATE" = "y"; then
- VERSION=$(date +%Y%m%d)
+# VERSION=$(date +%Y%m%d)
+ VERSION=snapshot
else
- VERSION=cvs
+# VERSION=cvs
+ VERSION=snapshot
fi
- SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+# SOURCE=$SPELL.tar.bz2
+# SOURCE=ffmpeg_20060519.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ffmpeg_20060519
+#
SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+# SOURCE_URL[0]=http://www.mplayerhq.hu/~rtogni/snapshots/$SOURCE
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
UPDATED=20041205
- SOURCE_IGNORE=volatile
+# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- FORCE_DOWNLOAD=on
+# FORCE_DOWNLOAD=on
+ KEYWORDS="video"
+ PATCHLEVEL=1
SHORT="ffmpeg is complete video and audio broadcasting solution"
cat << EOF
FFMpeg is a complete and free Internet live audio and video
diff --git a/video/ffmpeg-cvs/EXPORTS b/video/ffmpeg-cvs/EXPORTS
new file mode 100644
index 0000000..331ea6d
--- /dev/null
+++ b/video/ffmpeg-cvs/EXPORTS
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE
diff --git a/video/ffmpeg-cvs/HISTORY b/video/ffmpeg-cvs/HISTORY
index 5247467..1cc6f11 100644
--- a/video/ffmpeg-cvs/HISTORY
+++ b/video/ffmpeg-cvs/HISTORY
@@ -1,3 +1,31 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * deprecated for ffmpeg-svn
+ * EXPORTS, REPAIR^none^EXPORTS: added so ffmpeg-svn can read our
+ AUTOUPDATE variable and use that as its own default
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
+2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on sdl
+ * BUILD: fix SDL_LIBS after running configure so it works with
+ SDL 1.2.10
+
+2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
+ * BUILD: replaced fPIC and DPIC removal code with disable_pic
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: removed creation of /usr/include/postproc and copying
+ of dsputil.h, both handled by the Makefiles now,
+ removed installation of several headers that aren't necessary
anymore
+ * bswap-fix.patch, PRE_BUILD: removed, bswap header isn't installed
+
2006-02-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD, INSTALL: removed old hacks for libpostproc build/install,
create /usr/include/postproc before installing
diff --git a/video/ffmpeg-cvs/INSTALL b/video/ffmpeg-cvs/INSTALL
index 94e1061..27ba77d 100755
--- a/video/ffmpeg-cvs/INSTALL
+++ b/video/ffmpeg-cvs/INSTALL
@@ -1,15 +1 @@
-# make install fails to create that first (2006-02-17)
-install -d /usr/include/postproc &&
-make install &&
-install -m 644 libavcodec/libpostproc/postprocess_internal.h \
- ${INSTALL_ROOT}/usr/include/postproc &&
-install -m 644 libavutil/bswap.h \
- ${INSTALL_ROOT}/usr/include/ffmpeg &&
-install -m 644 libavcodec/dsputil.h \
- ${INSTALL_ROOT}/usr/include/ffmpeg &&
-install -m 644 libavformat/os_support.h \
- ${INSTALL_ROOT}/usr/include/ffmpeg &&
-
-if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
-then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
-fi
+true
diff --git a/video/ffmpeg-cvs/PREPARE b/video/ffmpeg-cvs/PREPARE
deleted file mode 100755
index 11200ef..0000000
--- a/video/ffmpeg-cvs/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query FFMPEG_CVS_AUTOUPDATE "Update to the latest CVS on every cast?"
n
diff --git a/video/ffmpeg-cvs/PRE_BUILD b/video/ffmpeg-cvs/PRE_BUILD
index c66fd34..27ba77d 100755
--- a/video/ffmpeg-cvs/PRE_BUILD
+++ b/video/ffmpeg-cvs/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/bswap-fix.patch
+true
diff --git a/video/ffmpeg-cvs/PROVIDES b/video/ffmpeg-cvs/PROVIDES
deleted file mode 100755
index d50bfee..0000000
--- a/video/ffmpeg-cvs/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides LIBAVCODEC
diff --git a/video/ffmpeg-cvs/REPAIR^none^EXPORTS
b/video/ffmpeg-cvs/REPAIR^none^EXPORTS
new file mode 100644
index 0000000..331ea6d
--- /dev/null
+++ b/video/ffmpeg-cvs/REPAIR^none^EXPORTS
@@ -0,0 +1 @@
+FFMPEG_CVS_AUTOUPDATE
diff --git a/video/ffmpeg-cvs/TRIGGERS b/video/ffmpeg-cvs/TRIGGERS
new file mode 100644
index 0000000..d53b9bb
--- /dev/null
+++ b/video/ffmpeg-cvs/TRIGGERS
@@ -0,0 +1 @@
+on_cast ffmpeg-cvs dispel_self
diff --git a/video/ffmpeg-cvs/bswap-fix.patch
b/video/ffmpeg-cvs/bswap-fix.patch
deleted file mode 100644
index 4cc17ed..0000000
--- a/video/ffmpeg-cvs/bswap-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libavutil/bswap.h~ 2005-12-20 21:10:50.000000000 +0100
-+++ libavutil/bswap.h 2005-12-21 00:26:57.000000000 +0100
-@@ -9,6 +9,7 @@
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
- #else
-+#include "common.h"
-
- #ifdef ARCH_X86_64
- # define LEGACY_REGS "=Q"
diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
new file mode 100644
index 0000000..abeb30b
--- /dev/null
+++ b/video/ffmpeg-svn/BUILD
@@ -0,0 +1,13 @@
+CFLAGS="${CFLAGS/-funroll-loops/} -O3"
+disable_pic &&
+
+sedit 's:-lpostproc:-Llibpostproc -lpostproc:' libavcodec/Makefile &&
+sedit 's:-Werror::' libavformat/Makefile &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --enable-shared \
+ --enable-pp \
+ --enable-gpl \
+ $OPTS &&
+sedit 's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:' config.mak &&
+make
diff --git a/video/ffmpeg-svn/CONFLICTS b/video/ffmpeg-svn/CONFLICTS
new file mode 100644
index 0000000..767f932
--- /dev/null
+++ b/video/ffmpeg-svn/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts ffmpeg
+conflicts ffmpeg-cvs y
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
new file mode 100644
index 0000000..a54f50c
--- /dev/null
+++ b/video/ffmpeg-svn/DEPENDS
@@ -0,0 +1,37 @@
+depends subversion &&
+optional_depends "nasm" \
+ "" \
+ "--disable-mmx" \
+ "for MMX support" &&
+optional_depends "lame" \
+ "--enable-mp3lame" \
+ "" \
+ "for mp3 encoding via libmp3lame" &&
+optional_depends "libvorbis" \
+ "--enable-libogg --enable-vorbis" \
+ "" \
+ "for ogg/vorbis support" &&
+optional_depends "faad2" \
+ "--enable-faad" \
+ "" \
+ "for AAC audio support" &&
+optional_depends "imlib2" \
+ "" \
+ "" \
+ "for imlib2 support" &&
+optional_depends "freetype2" \
+ "" \
+ "" \
+ "for a text render plugin" &&
+optional_depends "libdts" \
+ "--enable-dts" \
+ "" \
+ "for DTS audio decoding" &&
+optional_depends "xvid" \
+ "--enable-xvid" \
+ "" \
+ "for xvid support" &&
+optional_depends sdl \
+ "" \
+ "--disable-ffplay" \
+ "for ffplay video player"
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
new file mode 100644
index 0000000..e7c3a24
--- /dev/null
+++ b/video/ffmpeg-svn/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=ffmpeg-svn
+if test "$FFMPEG_SVN_AUTOUPDATE" = "y"; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=svn
+fi
+ SOURCE=$SPELL.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/ffmpeg/trunk:$SPELL
+ WEB_SITE=http://ffmpeg.sourceforge.net
+ ENTERED=20030514
+ UPDATED=20041205
+ SOURCE_IGNORE=volatile
+ LICENSE[0]=GPL
+ FORCE_DOWNLOAD=on
+ KEYWORDS="video"
+ SHORT="ffmpeg is complete video and audio broadcasting solution"
+cat << EOF
+FFMpeg is a complete and free Internet live audio and video
+broadcasting solution for Linux/Unix. It also includes a digital VCR.
+It can encode in real time in many formats including MPEG1 audio and
+video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
+EOF
diff --git a/video/ffmpeg-svn/DOWNLOAD b/video/ffmpeg-svn/DOWNLOAD
new file mode 100644
index 0000000..b21c982
--- /dev/null
+++ b/video/ffmpeg-svn/DOWNLOAD
@@ -0,0 +1,43 @@
+function url_r_svn_crack() {
+
+ URL=`url_strip_prefix "$1" svn`
+ R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
+ R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
+ local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
+ R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
+
+}
+
+url_r_svn_crack ${SOURCE_URL}
&&
+message "${MESSAGE_COLOR}Starting SVN checkout of"
\
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/${SOURCE}
&&
+ cd $R_SVN_MODULE
&&
+ message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ update
\
+ -r${R_SVN_TAG}
&&
+ cd ..
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+ message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ checkout
\
+ -r${R_SVN_TAG}
\
+ svn://${R_SVN_ROOT}
\
+ ${R_SVN_MODULE}
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi
&&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
+tar -jcf
\
+ ${SOURCE}
\
+ ${R_SVN_MODULE}
&&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
+rm ${SOURCE}
&&
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
new file mode 100644
index 0000000..4ebffc8
--- /dev/null
+++ b/video/ffmpeg-svn/HISTORY
@@ -0,0 +1,182 @@
+2006-05-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * renamed from ffmpeg-cvs
+ * DETAILS: renamed to ffmpeg-svn, changed SOURCE_URL to use new
+ svn server, removed the whole snapshot stuff again
+ * DEPENDS: depends on subversion instead of CVS now
+ * CONFLICTS: added conflicts ffmpeg-cvs y
+ * DOWNLOAD: added to handle svn:// url for stable sorcery
+ * PREPARE: persistent_read the old value of AUTOUPDATE from ffmpeg-cvs
+ and use that as default for our own
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
+2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on sdl
+ * BUILD: fix SDL_LIBS after running configure so it works with
+ SDL 1.2.10
+
+2006-04-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx:
+ * BUILD: replaced fPIC and DPIC removal code with disable_pic
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: removed creation of /usr/include/postproc and copying
+ of dsputil.h, both handled by the Makefiles now,
+ removed installation of several headers that aren't necessary
anymore
+ * bswap-fix.patch, PRE_BUILD: removed, bswap header isn't installed
+
+2006-02-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, INSTALL: removed old hacks for libpostproc build/install,
+ create /usr/include/postproc before installing
+
+2006-02-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE, DETAILS: added autoupdate query
+
+2006-01-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed --enable-shared-pp, not used anymore and breaks the
+ compile
+
+2005-12-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, bswap-fix.patch: fix the bswap.h header
+
+2005-09-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --mandir switch to configure so man pages go to
+ /usr/share/man instead of /usr/man
+
+2005-08-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: copy bswap.h from libavutil instead of libavcodec
+
+2005-05-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: don't fiddle with CXXFLAGS, they're unused anyway,
+ don't remove -DPIC -fPIC on x86_64, fixes bug #8851
+
+2005-05-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, DEPENDS, DETAILS: remove the gcc 3.4 stuff, compiles with 4.0
+ now
+
+2005-04-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: call invoke_gcc at the beginning
+ * DETAILS: add GCC_VERSION=3.4
+ * DEPENDS: added dependency on gcc34, changed configure switch for
+ vorbis to '--enable-libogg --enable-vorbis'
+
+2005-04-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: don't replace pentium4 with pentium3, that's only needed for
+ the ffmpeg release, ffmpeg-cvs actually breaks due to it
+
+2005-03-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: add --enable-ogg to vorbis OPTS flags
+
+2005-03-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: replace pentium4 with pentium3 in CFLAGS, fixes bug #8362
+
+2004-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: removed the --enable-liba52, breaks dvd playback in mplayer
+
+2004-11-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, gcc-3.4.patch, ffmpeg.patch: removed patches
+
+2004-07-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on xvid
+
+2004-07-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on libdts
+
+2004-07-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, INSTALL: converted to build_api 2
+ * DETAILS: use $(date +%Y%m%d) as VERSION
+
+2004-07-07 Eric Sandall <eric AT sandall.us>
+ * BUILD: Remove "-DPIC -fPIC" from C{XX}FLAGS as ffmpeg fails
+ to compile with PIC
+
+2004-05-14 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Depends on any provider of CVS (Bug #6396)
+
+2004-05-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, gcc-3.4.patch: patch to compile with gcc 3.4
+
+2004-04-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: add --enable-gpl
+ * BUILD, faad2.patch: removed patch
+
+2004-02-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, linux-2.6.patch: removed patch
+
+2003-12-15 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, linux-2.6.patch: support building with 2.6 kernel headers
+
+2003-12-07 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, faad2.patch: support faad2 2.0
+
+2003-12-05 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: add cvs
+
+2003-12-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: use FORCE_DOWNLOAD=on
+
+2003-10-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: rational.h is now installed automatically, but MPlayer-cvs
also
+ needs dsputil.h, installing that
+
+2003-10-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: install libavcodec/rational.h, used by avcodec.h
+
+2003-10-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, ffmpeg.patch: patch avcodec.h, otherwise MPlayer(-cvs) can
not
+ use it
+
+2003-10-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed SOURCE_URL to
+ cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+ changed VERSION from 'head' to 'current' to force redownload
+
+2003-10-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: BUILD: install libavcodec/bswap.h and
libavformat/os_support.h
+
+2003-08-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on freetype2
+
+2003-08-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on imlib2
+
+2003-07-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: added sedit to BUILD to remove the crappy -Werror flag
+ * DEPENDS: added faad2 as optional_depends
+
+2003-06-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: make the shared libpostproc work
+
+2003-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: use $INSTALL_ROOT in BUILD
+
+2003-05-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: first cvs version of the spell
+ * BUILD: added the libpostproc header installation to BUILD,
+ so mplayer-cvs compiles
+ * PROVIDES: added PROVIDES libavcodec
+
+2003-02-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: enabled building of shared libavcodec
+ * DEPENDS: added lame and libvorbis as optional_depends
+
+2003-02-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.4.6
+
+2002-10-30 Seth Woolley <seth AT tautology.org>
+ * BUILD: fixed BUILD/CONFIGURE issue with MMX
+ deleted CONFIGURE bug 1525
+
+2002-10-23 Seth Woolley <seth AT tautology.org>
+ * BUILD: added -O3 hack
+ * HISTORY: cleaned history
+
+2002-06-12 Unet <unet AT sourcemage.org>
+ * Created this.
+
diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
new file mode 100644
index 0000000..1e537a5
--- /dev/null
+++ b/video/ffmpeg-svn/INSTALL
@@ -0,0 +1,5 @@
+make install &&
+
+if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ]
+then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf
+fi
diff --git a/video/ffmpeg-svn/PREPARE b/video/ffmpeg-svn/PREPARE
new file mode 100644
index 0000000..6ae3af0
--- /dev/null
+++ b/video/ffmpeg-svn/PREPARE
@@ -0,0 +1,2 @@
+persistent_read ffmpeg-cvs FFMPEG_CVS_AUTOUPDATE DEFAULT
+config_query FFMPEG_SVN_AUTOUPDATE "Update to the latest SVN on every cast?"
${DEFAULT:-n}
diff --git a/video/ffmpeg-svn/PROVIDES b/video/ffmpeg-svn/PROVIDES
new file mode 100644
index 0000000..d50bfee
--- /dev/null
+++ b/video/ffmpeg-svn/PROVIDES
@@ -0,0 +1 @@
+provides LIBAVCODEC
diff --git a/video/kaffeine/DETAILS b/video/kaffeine/DETAILS
index 9e475ac..53fc73d 100755
--- a/video/kaffeine/DETAILS
+++ b/video/kaffeine/DETAILS
@@ -1,14 +1,15 @@
SPELL=kaffeine
- VERSION=0.7.1
+ VERSION=0.8.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:99aefc97eb6149f063cc3cd56bf2b8fd41cba1b90d359abf88ce7b3b52d42c2ab5948aa49238f63c6354ef139107ffd7c2818a77c5d75f9ae0f7b3b928d9986d
WEB_SITE=http://kaffeine.sourceforge.net
ENTERED=20040117
UPDATED=20040117
LICENSE[0]=GPL
DOCS="COPYING README"
+ KEYWORDS="gstreamer player kde video"
SHORT="Kaffeine is a xine and gstreamer based media player for
KDE3"
cat << EOF
Kaffeine is a xine and gstreamer based media player for KDE3.
diff --git a/video/kaffeine/HISTORY b/video/kaffeine/HISTORY
index 2df5218..f5ea00c 100644
--- a/video/kaffeine/HISTORY
+++ b/video/kaffeine/HISTORY
@@ -1,3 +1,13 @@
+2006-04-26 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: changed SOURCE_HASH to SOURCE_GPG, sign the source as the
+ checksum wasn't updated when the version was
+
+2006-04-12 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Updated to 0.8.1. Thanks to lynxlynxlynx!
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
2005-12-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: gstreamer -> gstreamer-0.8

diff --git a/video/kaffeine/kaffeine-0.8.1.tar.bz2.sig
b/video/kaffeine/kaffeine-0.8.1.tar.bz2.sig
new file mode 100644
index 0000000..03b38db
Binary files /dev/null and b/video/kaffeine/kaffeine-0.8.1.tar.bz2.sig differ
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index c8af977..0c4eb9e 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -1,6 +1,6 @@
depends CVS &&

-optional_depends ffmpeg-cvs \
+optional_depends ffmpeg-svn \
"--avformat-shared --avformat-ldextra" \
"--disable-avformat" \
"Enable avformat module" &&
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 6084250..0135062 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
2005-11-30 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 IGNORE to SOURCE_HASH volatile

diff --git a/video/mplayer/BUILD b/video/mplayer/BUILD
index 9b7edb6..66651d9 100755
--- a/video/mplayer/BUILD
+++ b/video/mplayer/BUILD
@@ -1,15 +1,14 @@
-invoke_gcc
# needed so it actually uses gcc 3.4
OPTS="$OPTS --cc=gcc" &&

-if [ "$MPLAYER_CVS" != "y" ]; then
+if [[ $MPLAYER_SVN = n ]]; then
OPTS="$OPTS --enable-libavcodec"
else
OPTS="$OPTS --with-extraincdir=/usr/include/ffmpeg"
fi &&

# remove --enable-old-gtk for 1.0pre7try2 as it doesn't know that option
-if [ "$MPLAYER_GUI" = "gtk+" -a "$MPLAYER_CVS" = "n" ]; then
+if [[ $MPLAYER_GUI = gtk+ && $MPLAYER_SVN = n ]]; then
OPTS="${OPTS/--enable-old-gtk/}"
fi &&
if [ "$MPLAYER_JOYSTICK" = "y" ]; then
diff --git a/video/mplayer/CONFIGURE b/video/mplayer/CONFIGURE
index 6095bca..7e7ba10 100755
--- a/video/mplayer/CONFIGURE
+++ b/video/mplayer/CONFIGURE
@@ -1,4 +1,4 @@
-if [ "$MPLAYER_CVS" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
if [ "$GUI" == "y" ]; then
config_query_list MPLAYER_GUI "What GUI do you want?" gtk+ gtk+2 none
else
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index eb911a1..29a3375 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -1,4 +1,4 @@
-if [ "$MPLAYER_CVS" == "n" ]; then
+if [[ $MPLAYER_SVN = n ]]; then
depends gcc34
fi &&
if [ "$MPLAYER_GUI" == "gtk+" ]
@@ -9,12 +9,10 @@ then depends gtk+2 '--enable-gui' &&
depends mplayer-gui
fi &&

-if [ "$MPLAYER_CVS" == "y" ]; then
- depends CVS &&
- optional_depends ffmpeg-cvs \
- "--enable-libavcodec_so --enable-libavformat_so --enable-libpostproc_so"
\
- "--disable-libavcodec_so --disable-libavformat_so
--disable-libpostproc_so" \
- "for libavcodec audio/video decoders (you really want this)" &&
+if [[ $MPLAYER_SVN = y ]]; then
+ depends subversion &&
+ optional_depends ffmpeg-svn \
+ "--disable-libavcodec --enable-libavcodec_so --disable-libavformat
--enable-libavformat_so --disable-libpostproc --enable-libpostproc_so
--disable-libavutil --enable-libavutil_so" "" "to use system ffmpeg instead
of internal one" &&
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support"
fi &&

@@ -36,7 +34,7 @@ optional_depends quicktime-codecs "" "-
optional_depends real-codecs "" "--disable-real" "to decode RealMedia
files" "z-rejected" &&
optional_depends xanim-codecs "" "--disable-xanim" "for additional codecs
(intel indeo, ...)" "z-rejected" &&
optional_depends xvid "" "--disable-xvid" "for encoding with the xvid codec
(distribution in USA and Japan is forbidden)" &&
-if [ "$MPLAYER_CVS" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
optional_depends twolame "" "--disable-twolame" "Twolame (MPEG layer 2
audio) support in mencoder"
fi &&

diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 761cd89..ba67a85 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -1,15 +1,15 @@
SPELL=mplayer
-if [ "$MPLAYER_CVS" == "y" ]; then
- if [ "$MPLAYER_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
+ if [[ $MPLAYER_SVN_AUTOUPDATE = y ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=svn
fi
- SOURCE=$SPELL-cvs.tar.bz2
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/mplayer:main
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/mplayer/trunk/:$SPELL-svn
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
VERSION=1.0pre7try2
SOURCE=MPlayer-$VERSION.tar.bz2
@@ -19,6 +19,7 @@ else
SOURCE_HASH=sha1:dcaced128167f15d094c9b63ca8b3dfd8f583e32
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MPlayer-$VERSION
GCC_VERSION=3.4
+ SECURITY_PATCH=1
fi
WEB_SITE=http://www.mplayerhq.hu
LICENSE[0]=GPL
diff --git a/video/mplayer/DOWNLOAD b/video/mplayer/DOWNLOAD
new file mode 100755
index 0000000..1a5913d
--- /dev/null
+++ b/video/mplayer/DOWNLOAD
@@ -0,0 +1,47 @@
+function url_r_svn_crack() {
+
+ URL=`url_strip_prefix "$1" svn`
+ R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
+ R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
+ local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
+ R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
+
+}
+
+if [[ $(url_get_prefix) != svn ]]; then
+ default_download
+ return $?
+fi &&
+url_r_svn_crack ${SOURCE_URL}
&&
+message "${MESSAGE_COLOR}Starting SVN checkout of"
\
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/${SOURCE}
&&
+ cd $R_SVN_MODULE
&&
+ message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ update
\
+ -r${R_SVN_TAG}
&&
+ cd ..
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+ message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ checkout
\
+ -r${R_SVN_TAG}
\
+ svn://${R_SVN_ROOT}
\
+ ${R_SVN_MODULE}
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi
&&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
+tar -jcf
\
+ ${SOURCE}
\
+ ${R_SVN_MODULE}
&&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
+rm ${SOURCE}
&&
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index cd919f4..9d60f43 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,30 @@
+2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DOWNLOAD: fixed so it actually works with non-svn version
+
+2006-06-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, patch-CVS-2006-1502: security patch for bug #10883
+ * DETAILS: SECURITY_PATCH=1 for the release version
+
+2006-06-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: switched from snapshot to new svn checkout for the scm
+ version
+ * DOWNLOAD: added for svn download
+ * BUILD, CONFIGURE, DEPENDS, PREPARE, PRE_BUILD: changed variables
+ from MPLAYER_CVS* to MPLAYER_SVN*
+ * BUILD, PRE_BUILD: moved invoke_gcc call to PRE_BUILD
+ * DEPENDS: changed switches for ffmpeg-svn optional_depends, this is
+ required because the svn checkout includes a full copy of ffmpeg
+ svn
+
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
2006-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* cvs.Makefile.patch: updated

diff --git a/video/mplayer/PREPARE b/video/mplayer/PREPARE
index 44e8002..08386a5 100755
--- a/video/mplayer/PREPARE
+++ b/video/mplayer/PREPARE
@@ -1,9 +1,9 @@
-config_query MPLAYER_CVS "Build CVS version?" ${CVS:-n}
-# remove this and the above $CVS check from devel/test once this is in stable
-# 2005-09-29 Arwed v. Merkatz
-persistent_remove CVS
-if [ "$MPLAYER_CVS" == "y" ]; then
- config_query MPLAYER_CVS_AUTOUPDATE \
- "Update to the latest CVS on every cast?" \
- n
+# changed CVS -> SVN, remove from test when it's in stable
+# 2006-06-05 Arwed v. Merkatz
+config_query MPLAYER_SVN "Build SVN version?" ${MPLAYER_CVS:-n}
+if [[ $MPLAYER_SVN = y ]]; then
+ config_query MPLAYER_SVN_AUTOUPDATE \
+ "Update to the latest SVN on every system-update?" \
+ ${MPLAYER_CVS_AUTOUPDATE:-n}
fi
+persistent_remove MPLAYER_CVS MPLAYER_CVS_AUTOUPDATE
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
index 5bf17c7..95ed630 100755
--- a/video/mplayer/PRE_BUILD
+++ b/video/mplayer/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
+invoke_gcc &&
cd $SOURCE_DIRECTORY &&
-if [ "$MPLAYER_CVS" = "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
patch Makefile $SCRIPT_DIRECTORY/cvs.Makefile.patch &&
if [ "$MPLAYER_GUI" == "gtk+" ]; then
sedit "s|_gui=no|_gui=yes|" configure &&
@@ -10,6 +11,8 @@ if [ "$MPLAYER_CVS" = "y" ]; then
fi

else
+ # patch for bug #10883
+ patch -p0 < $SCRIPT_DIRECTORY/patch-CVE-2006-1502 &&
# fixes bug #6833
patch Makefile $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/mplayer-headers.patch
diff --git a/video/mplayer/mplayer_20060519.tar.bz2.sig
b/video/mplayer/mplayer_20060519.tar.bz2.sig
new file mode 100644
index 0000000..874edfc
Binary files /dev/null and b/video/mplayer/mplayer_20060519.tar.bz2.sig differ
diff --git a/video/mplayer/patch-CVE-2006-1502
b/video/mplayer/patch-CVE-2006-1502
new file mode 100644
index 0000000..4e9fe7e
--- /dev/null
+++ b/video/mplayer/patch-CVE-2006-1502
@@ -0,0 +1,69 @@
+--- libmpdemux/aviheader.c.orig Tue Feb 22 17:24:18 2005
++++ libmpdemux/aviheader.c Fri Apr 7 11:56:53 2006
+@@ -205,8 +205,10 @@
+ break; }
+ case mmioFOURCC('i', 'n', 'd', 'x'): {
+ uint32_t i;
+- unsigned msize = 0;
+ avisuperindex_chunk *s;
++ if(chunksize<=24){
++ break;
++ }
+ priv->suidx_size++;
+ priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof
(avisuperindex_chunk));
+ s = &priv->suidx[priv->suidx_size-1];
+@@ -224,11 +226,18 @@
+
+ print_avisuperindex_chunk(s);
+
+- msize = sizeof (uint32_t) * s->wLongsPerEntry * s->nEntriesInUse;
+- s->aIndex = malloc(msize);
+- memset (s->aIndex, 0, msize);
+- s->stdidx = malloc (s->nEntriesInUse * sizeof (avistdindex_chunk));
+- memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk));
++ if( ((chunksize/4)/s->wLongsPerEntry) < s->nEntriesInUse){
++ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk\n");
++ s->nEntriesInUse = (chunksize/4)/s->wLongsPerEntry;
++ }
++
++ // Check and fix this useless crap
++ if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
++ mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size:
%u\n",s->wLongsPerEntry);
++ s->wLongsPerEntry = sizeof(avisuperindex_entry)/4;
++ }
++ s->aIndex = calloc(s->nEntriesInUse, sizeof (avisuperindex_entry));
++ s->stdidx = calloc(s->nEntriesInUse, sizeof (avistdindex_chunk));
+
+ // now the real index of indices
+ for (i=0; i<s->nEntriesInUse; i++) {
+@@ -636,6 +645,8 @@
+ idx->dwChunkLength=len;
+
+ c=stream_read_dword(demuxer->stream);
++
++ if(!len) idx->dwFlags&=~AVIIF_KEYFRAME;
+
+ // Fix keyframes for DivX files:
+ if(idxfix_divx)
+--- libmpdemux/asfheader.c.orig Sat Dec 25 09:31:32 2004
++++ libmpdemux/asfheader.c Fri Apr 7 11:55:29 2006
+@@ -189,7 +189,7 @@
+ while ((pos = find_asf_guid(hdr, asf_stream_header_guid, pos, hdr_len))
>= 0)
+ {
+ ASF_stream_header_t *streamh = (ASF_stream_header_t *)&hdr[pos];
+- char *buffer;
++ uint8_t *buffer;
+ pos += sizeof(ASF_stream_header_t);
+ if (pos > hdr_len) goto len_err_out;
+ le2me_ASF_stream_header_t(streamh);
+@@ -222,7 +222,9 @@
+ asf_scrambling_h=buffer[0];
+ asf_scrambling_w=(buffer[2]<<8)|buffer[1];
+ asf_scrambling_b=(buffer[4]<<8)|buffer[3];
+- asf_scrambling_w/=asf_scrambling_b;
++ if(asf_scrambling_b>0){
++ asf_scrambling_w/=asf_scrambling_b;
++ }
+ } else {
+ asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1;
+ }
diff --git a/video/mythtv/BUILD b/video/mythtv/BUILD
index 454bcfd..d9c62c7 100755
--- a/video/mythtv/BUILD
+++ b/video/mythtv/BUILD
@@ -1,6 +1,6 @@
#sedit "s:/usr/local:$INSTALL_ROOT/usr:" configure &&
#sedit "s:/usr/local:$INSTALL_ROOT/usr:" settings.pro &&
invoke_gcc
-./configure --prefix=/usr $OPTS &&
+./configure --prefix=/usr --disable-distcc $OPTS &&
qmake mythtv.pro &&
make
diff --git a/video/mythtv/HISTORY b/video/mythtv/HISTORY
index 9cc355b..3acda46 100644
--- a/video/mythtv/HISTORY
+++ b/video/mythtv/HISTORY
@@ -1,3 +1,6 @@
+2006-05-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD: disable distcc as it breaks, bug #10422
+
2006-02-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.19

diff --git a/video/tcvp/DEPENDS b/video/tcvp/DEPENDS
index 5ea72c1..6ca552e 100755
--- a/video/tcvp/DEPENDS
+++ b/video/tcvp/DEPENDS
@@ -1,5 +1,5 @@
depends tc2-modules &&
-optional_depends "ffmpeg-cvs" \
+optional_depends "ffmpeg-svn" \
"--enable-avformat --enable-avcodec" \
"--disable-avformat --disable-avcodec" \
"for lots of video formats/codecs" &&
diff --git a/video/tcvp/HISTORY b/video/tcvp/HISTORY
index 408f651..6728637 100644
--- a/video/tcvp/HISTORY
+++ b/video/tcvp/HISTORY
@@ -1,3 +1,6 @@
+2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: changed ffmpeg-cvs to ffmpeg-svn
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/video/vobcopy/BUILD b/video/vobcopy/BUILD
index b733a8b..efdc7f3 100755
--- a/video/vobcopy/BUILD
+++ b/video/vobcopy/BUILD
@@ -1,3 +1,5 @@
+./configure.sh &&
sedit 's:/local::' Makefile &&
sedit 's:^MANDIR =.*:MANDIR=$(PREFIX)/share/man:' Makefile &&
make
+
diff --git a/video/vobcopy/DETAILS b/video/vobcopy/DETAILS
index d09f297..cb0fbf3 100755
--- a/video/vobcopy/DETAILS
+++ b/video/vobcopy/DETAILS
@@ -1,5 +1,5 @@
SPELL=vobcopy
- VERSION=0.5.16
+ VERSION=1.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://lpn.rnbhq.org/download/$SOURCE
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
ENTERED=20020327
UPDATED=20020921
+ KEYWORDS="dvd video"
SHORT="copy VOB files from DVD's"
cat << EOF
vobcopy copies DVD .vob files to harddisk, decrypting (if you have libdvdcss
diff --git a/video/vobcopy/HISTORY b/video/vobcopy/HISTORY
index 9365a41..1a79eec 100644
--- a/video/vobcopy/HISTORY
+++ b/video/vobcopy/HISTORY
@@ -1,3 +1,10 @@
+2006-04-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 1.0.0
+ * BUILD: run ./configure.sh so the Makefile doesn't try to call
gcc-3.4
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
2006-01-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 0.5.16

diff --git a/video/vobcopy/vobcopy-0.5.16.tar.bz2.sig
b/video/vobcopy/vobcopy-0.5.16.tar.bz2.sig
deleted file mode 100644
index 15ca40f..0000000
Binary files a/video/vobcopy/vobcopy-0.5.16.tar.bz2.sig and /dev/null differ
diff --git a/video/vobcopy/vobcopy-1.0.0.tar.bz2.sig
b/video/vobcopy/vobcopy-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..35c9482
Binary files /dev/null and b/video/vobcopy/vobcopy-1.0.0.tar.bz2.sig differ
diff --git a/video/xvattr/HISTORY b/video/xvattr/HISTORY
index a7bb9fc..87f8c00 100644
--- a/video/xvattr/HISTORY
+++ b/video/xvattr/HISTORY
@@ -1,3 +1,6 @@
+2006-05-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: really added the file, bug #12051
+
2005-11-29 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512

diff --git a/video/xvattr/INSTALL b/video/xvattr/INSTALL
new file mode 100644
index 0000000..246ef77
--- /dev/null
+++ b/video/xvattr/INSTALL
@@ -0,0 +1,5 @@
+install -m 755 xvattr ${INSTALL_ROOT}/usr/bin &&
+install -m 644 xvattr.1 ${INSTALL_ROOT}/usr/share/man/man1 &&
+if [ -x gxvattr ]; then
+ install -m 755 gxvattr ${INSTALL_ROOT}/usr/bin
+fi



  • [SM-Commit] GIT changes to stable-rc-0.4 grimoire by Arwed v. Merkatz (d64fb469be3b844bb0b39969465847adfa9269fc), Arwed v. Merkatz, 06/17/2006

Archive powered by MHonArc 2.6.24.

Top of Page