summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-02 22:10:42 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-02 22:10:42 +0000
commit0e0d2f32302abb0624f0044e8efcdb9afc1f5fe0 (patch)
tree22b3cb0bdd9f36e76b3644c544ae4797983e6f22 /media-libs/smpeg
parentfix invalid atoms (diff)
downloadhistorical-0e0d2f32302abb0624f0044e8efcdb9afc1f5fe0.tar.gz
historical-0e0d2f32302abb0624f0044e8efcdb9afc1f5fe0.tar.bz2
historical-0e0d2f32302abb0624f0044e8efcdb9afc1f5fe0.zip
Add quick patch to fix build on FreeBSD. Bug #132024 from Robert Sebastian Gerus.
Package-Manager: portage-2.1_pre10-r2
Diffstat (limited to 'media-libs/smpeg')
-rw-r--r--media-libs/smpeg/ChangeLog7
-rw-r--r--media-libs/smpeg/Manifest33
-rw-r--r--media-libs/smpeg/files/smpeg-0.4.4-malloc.patch25
-rw-r--r--media-libs/smpeg/smpeg-0.4.4-r8.ebuild3
4 files changed, 55 insertions, 13 deletions
diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog
index efb8df66b1be..29057eb38c65 100644
--- a/media-libs/smpeg/ChangeLog
+++ b/media-libs/smpeg/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/smpeg
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.36 2006/04/24 02:39:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.37 2006/05/02 22:10:42 flameeyes Exp $
+
+ 02 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/smpeg-0.4.4-malloc.patch, smpeg-0.4.4-r8.ebuild:
+ Add quick patch to fix build on FreeBSD. Bug #132024 from Robert Sebastian
+ Gerus.
29 Apr 2006; Joshua Kinard <kumba@gentoo.org> smpeg-0.4.4-r7.ebuild:
Marked stable on mips.
diff --git a/media-libs/smpeg/Manifest b/media-libs/smpeg/Manifest
index 10063098dc07..0ccadf7e221a 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX smpeg-0.4.4-PIC.patch 9472 RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 SHA1 ca210893cfd50554730918e572dc6d48192aa3f4 SHA256 a9fd3b892e06a00e31fedf719df0ff2bccac0542da9d1008d90712086ccc310f size 9472
MD5 3ab2c17a1fa8a3c293ec83d7f4d45515 files/smpeg-0.4.4-PIC.patch 9472
RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 files/smpeg-0.4.4-PIC.patch 9472
@@ -26,6 +29,10 @@ AUX smpeg-0.4.4-m4.patch 233 RMD160 5a417da55e0d8048850b71bbe82e94b794ad261b SHA
MD5 dcc2db7c8aa509096fc557b99bd35490 files/smpeg-0.4.4-m4.patch 233
RMD160 5a417da55e0d8048850b71bbe82e94b794ad261b files/smpeg-0.4.4-m4.patch 233
SHA256 e80d9b6dbb2c0e55972414378f999570d7620039185dbbd7a884d8d24b190d58 files/smpeg-0.4.4-m4.patch 233
+AUX smpeg-0.4.4-malloc.patch 640 RMD160 1c2eb29efb5ffb9c5c86d344d5ee0591b1278e44 SHA1 3c8722e389dd08af5669dcc02d61995cd752ca89 SHA256 7936cff7f0fe65929317bdad7c2711b35487af06e9dae9e0d9e91a77df13689b size 640
+MD5 d815117eecd706999e8b77de627e869e files/smpeg-0.4.4-malloc.patch 640
+RMD160 1c2eb29efb5ffb9c5c86d344d5ee0591b1278e44 files/smpeg-0.4.4-malloc.patch 640
+SHA256 7936cff7f0fe65929317bdad7c2711b35487af06e9dae9e0d9e91a77df13689b files/smpeg-0.4.4-malloc.patch 640
AUX smpeg-0.4.4-mmx.patch 352 RMD160 b0be5ec35a0b3bfce513285bc346b70b1989e4a8 SHA1 23c5a0cb58952998fc8507406459703de742aac2 SHA256 2dbcce8253b16b8882e491787d28a3410eb8e0ec29a300fed258bd899ac24248 size 352
MD5 4c9d4090c519892a955e89a57c07889c files/smpeg-0.4.4-mmx.patch 352
RMD160 b0be5ec35a0b3bfce513285bc346b70b1989e4a8 files/smpeg-0.4.4-mmx.patch 352
@@ -40,14 +47,14 @@ EBUILD smpeg-0.4.4-r7.ebuild 1683 RMD160 c5e18b933a28625bdd74d84877b92953b5cb467
MD5 f50311e192a7677a92e836e9a7c0ba47 smpeg-0.4.4-r7.ebuild 1683
RMD160 c5e18b933a28625bdd74d84877b92953b5cb4674 smpeg-0.4.4-r7.ebuild 1683
SHA256 cebce08b4f44645a67f9cfd28995ad5f7e888b8c806a21cc3e86bded2187a235 smpeg-0.4.4-r7.ebuild 1683
-EBUILD smpeg-0.4.4-r8.ebuild 1825 RMD160 4532b2348063025c0187ff50efb24ac1770843ef SHA1 c2e4aa8345dd9eec0605a504c710df31913264f2 SHA256 a82fff1957976cac05194dbcac31bdbecc4843da1e0630f8d125247a36de98c6 size 1825
-MD5 488a8576590863166ecbb2085ede55aa smpeg-0.4.4-r8.ebuild 1825
-RMD160 4532b2348063025c0187ff50efb24ac1770843ef smpeg-0.4.4-r8.ebuild 1825
-SHA256 a82fff1957976cac05194dbcac31bdbecc4843da1e0630f8d125247a36de98c6 smpeg-0.4.4-r8.ebuild 1825
-MISC ChangeLog 5209 RMD160 fe54a76e80c44c56e1804be08bdfd2d1fa469459 SHA1 472fea6368b74c9d28fa227d325b87c2fb676dc0 SHA256 64a416e7c3bc1279a218ee5432056465a9ada53747b706e0f79b08ba3de562b5 size 5209
-MD5 c258d476b626c1f54133c91b467e7034 ChangeLog 5209
-RMD160 fe54a76e80c44c56e1804be08bdfd2d1fa469459 ChangeLog 5209
-SHA256 64a416e7c3bc1279a218ee5432056465a9ada53747b706e0f79b08ba3de562b5 ChangeLog 5209
+EBUILD smpeg-0.4.4-r8.ebuild 1865 RMD160 8b4cc6749b0251eacc5b1a54defc201b47e1a506 SHA1 9d1b32b2d9632fe006b26ac10ab3417d0149a2d1 SHA256 78922c0b088d8dc61b76f3e5035dae71fe05ba13dfc5ac1e5ad479995a12a190 size 1865
+MD5 73799ed648d6a7889c09320b8a16f87b smpeg-0.4.4-r8.ebuild 1865
+RMD160 8b4cc6749b0251eacc5b1a54defc201b47e1a506 smpeg-0.4.4-r8.ebuild 1865
+SHA256 78922c0b088d8dc61b76f3e5035dae71fe05ba13dfc5ac1e5ad479995a12a190 smpeg-0.4.4-r8.ebuild 1865
+MISC ChangeLog 5411 RMD160 09eecbfc1bb48d7e0fd8dcece986a4f450d02a23 SHA1 2b78495128766e19680750633f09d2675cfda98e SHA256 acc9988f654f2767a4fe322c94e47696c0b74e506c3fd109978ce746484df52b size 5411
+MD5 f4f98182c1f4eef1148a40f30d3e2b11 ChangeLog 5411
+RMD160 09eecbfc1bb48d7e0fd8dcece986a4f450d02a23 ChangeLog 5411
+SHA256 acc9988f654f2767a4fe322c94e47696c0b74e506c3fd109978ce746484df52b ChangeLog 5411
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -55,12 +62,16 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
MD5 78bf245c414003866dbde12dc14e1906 files/digest-smpeg-0.4.4-r6 235
RMD160 db100f2c2285c7b196784274c73e26ac1b9e0438 files/digest-smpeg-0.4.4-r6 235
SHA256 f64408fd0645986b87a5963ebcb446ed7d97da14be31187fbb0c99ab2541d263 files/digest-smpeg-0.4.4-r6 235
-size 235 files/digest-smpeg-0.4.4-r6 235
MD5 5e6ac360ffb7bc06f5e84dfcf10f6351 files/digest-smpeg-0.4.4-r7 235
RMD160 81735fa25459610b96f89101e98f40ffa1e43090 files/digest-smpeg-0.4.4-r7 235
SHA256 1559afb84e0cc3bc6594906c50af3def3857f43b47c70e85a1307251c22c45e8 files/digest-smpeg-0.4.4-r7 235
-size 235 files/digest-smpeg-0.4.4-r7 235
MD5 6b606861eac5335ad46ca2e733526c08 files/digest-smpeg-0.4.4-r8 491
RMD160 b0ef3b2169ce6cea8dae35661784c36a9dfb8d2c files/digest-smpeg-0.4.4-r8 491
SHA256 0cc8ff5615246cee27638772b835648ad0a3d811c8279e19c772d447cdfff809 files/digest-smpeg-0.4.4-r8 491
-size 491 files/digest-smpeg-0.4.4-r8 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD4DBQFEV9joAiZjviIA2XgRAtAQAJdZm90qxyBNhuVJgmmMwyR7gTOcAKCpO04R
+aXCsd2reXVcsOMw6E3xNMQ==
+=3Ar5
+-----END PGP SIGNATURE-----
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
new file mode 100644
index 000000000000..be54e58b4d23
--- /dev/null
+++ b/media-libs/smpeg/files/smpeg-0.4.4-malloc.patch
@@ -0,0 +1,25 @@
+Index: smpeg-0.4.4/glmovie.c
+===================================================================
+--- smpeg-0.4.4.orig/glmovie.c
++++ smpeg-0.4.4/glmovie.c
+@@ -6,7 +6,6 @@
+ #include "smpeg.h"
+ #include "SDL.h"
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include "glmovie.h"
+Index: smpeg-0.4.4/glmovie-tile.c
+===================================================================
+--- smpeg-0.4.4.orig/glmovie-tile.c
++++ smpeg-0.4.4/glmovie-tile.c
+@@ -16,7 +16,7 @@
+ */
+
+ #include "glmovie.h"
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+
+ /* Some data is redundant at this stage. */
diff --git a/media-libs/smpeg/smpeg-0.4.4-r8.ebuild b/media-libs/smpeg/smpeg-0.4.4-r8.ebuild
index a4f13e64b93d..1212796aabfb 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r8.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r8.ebuild,v 1.2 2006/03/29 11:25:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r8.ebuild,v 1.3 2006/05/02 22:10:42 flameeyes Exp $
inherit eutils toolchain-funcs autotools
@@ -37,6 +37,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-flags.patch
epatch "${FILESDIR}"/${P}-automake.patch
epatch "${FILESDIR}"/${P}-mmx.patch
+ epatch "${FILESDIR}"/${P}-malloc.patch
cd "${WORKDIR}"
epatch "${DISTDIR}"/${P}-gtkm4.patch.bz2