Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2007-05-09 14:53:05 +0000
committerRyan Hill <rhill@gentoo.org>2007-05-09 14:53:05 +0000
commitb7561cd2fa3741246c68c8596425a898a6da4043 (patch)
tree0dee71b44056475ca0417faa5f171827bfe1a7b7 /media-libs
parentAdd ~ia64 wrt #160813 (diff)
downloadhistorical-b7561cd2fa3741246c68c8596425a898a6da4043.tar.gz
historical-b7561cd2fa3741246c68c8596425a898a6da4043.tar.bz2
historical-b7561cd2fa3741246c68c8596425a898a6da4043.zip
Fix parallel make race in ft2demos.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/freetype/ChangeLog7
-rw-r--r--media-libs/freetype/Manifest24
-rw-r--r--media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch (renamed from media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch)16
-rw-r--r--media-libs/freetype/freetype-2.3.3.ebuild6
4 files changed, 29 insertions, 24 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index f659335c1598..bffa2ba27310 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/freetype
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.132 2007/05/09 01:31:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.133 2007/05/09 14:53:05 dirtyepic Exp $
+
+ 09 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+ +files/freetype-2.3.3-ft2demos-Makefile.patch,
+ -files/freetype-2.3.3-fttimer-noX.patch, freetype-2.3.3.ebuild:
+ Fix parallel make race in ft2demos.
09 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+files/freetype-2.3.3-fttimer-noX.patch, freetype-2.3.3.ebuild:
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e81260c90f36..77776a01adee 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -34,10 +34,10 @@ AUX freetype-2.3.3-buffer-overwrite.patch 894 RMD160 6a53886d3a2129a634bfc336223
MD5 e0d01fb210f817a211ccd922d751592b files/freetype-2.3.3-buffer-overwrite.patch 894
RMD160 6a53886d3a2129a634bfc33622327914c4f4729c files/freetype-2.3.3-buffer-overwrite.patch 894
SHA256 4b3417e5c704f25a8a087949cc6a62cf92dfd53628bd466aa5a13940a3728905 files/freetype-2.3.3-buffer-overwrite.patch 894
-AUX freetype-2.3.3-fttimer-noX.patch 1461 RMD160 4c1ae1373d8d7e93e9245a4c0ca9ac346b1d6434 SHA1 98848d00227a04f97823cd0ffcb725cbd5f03b4c SHA256 88e93df0307e327f826432ad59d1c658851942ca4819cbe163e95b8b632cac51
-MD5 f18407e18c1a48c7950bcaa44cfd1daa files/freetype-2.3.3-fttimer-noX.patch 1461
-RMD160 4c1ae1373d8d7e93e9245a4c0ca9ac346b1d6434 files/freetype-2.3.3-fttimer-noX.patch 1461
-SHA256 88e93df0307e327f826432ad59d1c658851942ca4819cbe163e95b8b632cac51 files/freetype-2.3.3-fttimer-noX.patch 1461
+AUX freetype-2.3.3-ft2demos-Makefile.patch 1621 RMD160 5be4422135d6649902b2e511878a57fa0ff73306 SHA1 366db2ede6d0890ffbb92729396b9c134442a88d SHA256 0f172dd4aa4da75b3ba772aab9c27161db9edcc4d4dec54980e7015f5438384a
+MD5 9d328be2decd5da74d58e2b1c0bd9717 files/freetype-2.3.3-ft2demos-Makefile.patch 1621
+RMD160 5be4422135d6649902b2e511878a57fa0ff73306 files/freetype-2.3.3-ft2demos-Makefile.patch 1621
+SHA256 0f172dd4aa4da75b3ba772aab9c27161db9edcc4d4dec54980e7015f5438384a files/freetype-2.3.3-ft2demos-Makefile.patch 1621
DIST freetype-1.3.1.tar.gz 1427072 RMD160 43993a667b536b4f85d32318dec32eb3f3b66454 SHA1 a398fb4d6dd756826e459058d8075759086f8ca4 SHA256 a27271fc5b2d91ee8931972dfb9683cd3971272cfe04d03caf5d13b1db5287c4
DIST freetype-2.1.10-security_batch-r1.patch.bz2 10300 RMD160 3994ed6bd5fc3c1e09467267a00ae0166f180fc5 SHA1 3d9a74e6c2ccd18711610e39d339e8796108e2a5 SHA256 d1d31feb556c21a51a08451b14eccb697cf18979e2d24d4412ec47fa1597b296
DIST freetype-2.1.10.tar.bz2 1037107 RMD160 3d31d548632f14784283c97ece64c7425efc3975 SHA1 f9e5c52e466c3e41483d5d6d44b4f3135a9c4b16 SHA256 fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
@@ -71,18 +71,18 @@ EBUILD freetype-2.1.9-r1.ebuild 2125 RMD160 cb37dbc1753bc565b07842f44e012b6c26cc
MD5 30ca0975fc22badd82a7f5ce0f87ce79 freetype-2.1.9-r1.ebuild 2125
RMD160 cb37dbc1753bc565b07842f44e012b6c26cc2340 freetype-2.1.9-r1.ebuild 2125
SHA256 eb02a32636bf51252984236d4fdc61a12536b9317778cc0967a4e9d5e4c9c663 freetype-2.1.9-r1.ebuild 2125
-EBUILD freetype-2.3.3.ebuild 3377 RMD160 418c0fa04d4c05c88e764e49fc889f9a8ff455fb SHA1 e78d0dcb8d6187603af3f1fc48c9174b663d89fe SHA256 1277aa31621fa8bdb4dfba3258ccd485cff40fde046d1cd467fbe74e577308cc
-MD5 661ad5af7181d90b26f72cc8b2304430 freetype-2.3.3.ebuild 3377
-RMD160 418c0fa04d4c05c88e764e49fc889f9a8ff455fb freetype-2.3.3.ebuild 3377
-SHA256 1277aa31621fa8bdb4dfba3258ccd485cff40fde046d1cd467fbe74e577308cc freetype-2.3.3.ebuild 3377
+EBUILD freetype-2.3.3.ebuild 3315 RMD160 4efcfe7c35bed3831e718d0206e761ca352265c3 SHA1 fbccfa75d8fa18e99d2a085985f01f6b07f92b80 SHA256 92b68043a066a5cdacd3da8ee1f23d15f4fd87ac061ac815206188670d18204a
+MD5 4eb3024ef8a2b94ef3b3bde2a5505264 freetype-2.3.3.ebuild 3315
+RMD160 4efcfe7c35bed3831e718d0206e761ca352265c3 freetype-2.3.3.ebuild 3315
+SHA256 92b68043a066a5cdacd3da8ee1f23d15f4fd87ac061ac815206188670d18204a freetype-2.3.3.ebuild 3315
EBUILD freetype-2.3.4.ebuild 2910 RMD160 8e8e6108048459647dfc7d18cabc938eef17f556 SHA1 a0d4c1985906e835883628d323c4a52ae70c7e0f SHA256 0968e829a5c42d3e8356012589cbe06c28d95a18553e83912a1b5547dc94bc6a
MD5 ef47c8e25d5896eda9a4a0877f227e64 freetype-2.3.4.ebuild 2910
RMD160 8e8e6108048459647dfc7d18cabc938eef17f556 freetype-2.3.4.ebuild 2910
SHA256 0968e829a5c42d3e8356012589cbe06c28d95a18553e83912a1b5547dc94bc6a freetype-2.3.4.ebuild 2910
-MISC ChangeLog 19712 RMD160 862854a0fe63f736097a33e34c25bbeb6ea86e08 SHA1 3edb83ec2650eda02e36ec5c324b3dac80de7b8f SHA256 5fa199c3e7cacb966bacc3181815e89a130d4c73dd0d7709d6ea1184ccac0c82
-MD5 6f280ba6e63f0dbafc639526cc9f8a4a ChangeLog 19712
-RMD160 862854a0fe63f736097a33e34c25bbeb6ea86e08 ChangeLog 19712
-SHA256 5fa199c3e7cacb966bacc3181815e89a130d4c73dd0d7709d6ea1184ccac0c82 ChangeLog 19712
+MISC ChangeLog 19914 RMD160 26ba78321de7becf44474226e5d7facc2cc401de SHA1 850fa67abf8768aca85602df1d3a497fcf2ff535 SHA256 ac28a048d2a0aee2e14fec85ad398f227f25586c398c391370ff17091ac74a51
+MD5 949ec00be5d614182462f19ce51d7f8d ChangeLog 19914
+RMD160 26ba78321de7becf44474226e5d7facc2cc401de ChangeLog 19914
+SHA256 ac28a048d2a0aee2e14fec85ad398f227f25586c398c391370ff17091ac74a51 ChangeLog 19914
MISC metadata.xml 219 RMD160 71993cfc42c14ad1e5fa0f67864200489345b70f SHA1 700713fad4b00f68790cba19d660fa6f61223211 SHA256 4629bfc7523bb3880601e0fb403dca87c95fe12efd589135b9df8b5f21a02d23
MD5 900688457f98bf6b49bd2ef06e64e7be metadata.xml 219
RMD160 71993cfc42c14ad1e5fa0f67864200489345b70f metadata.xml 219
diff --git a/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch b/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch
index 4123f02ef08d..ece447615a02 100644
--- a/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch
+++ b/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch
@@ -1,6 +1,6 @@
diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile
---- ft2demos-2.3.3-orig/Makefile 2007-05-08 17:07:01.000000000 -0600
-+++ ft2demos-2.3.3/Makefile 2007-05-08 17:17:35.000000000 -0600
+--- ft2demos-2.3.3-orig/Makefile 2007-05-09 08:45:56.000000000 -0600
++++ ft2demos-2.3.3/Makefile 2007-05-09 08:47:23.000000000 -0600
@@ -308,6 +308,9 @@
$(OBJ_DIR_2)/ftmemchk.$(SO): $(SRC_DIR)/ftmemchk.c
$(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
@@ -22,16 +22,18 @@ diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile
# $(OBJ_DIR_2)/ftsbit.$(SO): $(SRC_DIR)/ftsbit.c $(GRAPH_LIB)
# $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
-@@ -441,6 +440,9 @@
- $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB)
+@@ -438,7 +437,10 @@
+ $(BIN_DIR_2)/ftvalid$E: $(OBJ_DIR_2)/ftvalid.$(SO) $(FTLIB) $(COMMON_OBJ)
$(LINK_COMMON)
-+ $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) $(COMMON_OBJ)
+- $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB)
++ $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB) $(COMMON_OBJ)
+ $(LINK_COMMON)
+
- $(BIN_DIR_2)/fttry$E: $(OBJ_DIR_2)/fttry.$(SO) $(FTLIB)
- $(LINK)
++ $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) $(COMMON_OBJ)
+ $(LINK_COMMON)
+ $(BIN_DIR_2)/fttry$E: $(OBJ_DIR_2)/fttry.$(SO) $(FTLIB)
@@ -481,10 +483,6 @@
$(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ)
$(LINK_NEW)
diff --git a/media-libs/freetype/freetype-2.3.3.ebuild b/media-libs/freetype/freetype-2.3.3.ebuild
index a8ea86d75112..a2400baab4c0 100644
--- a/media-libs/freetype/freetype-2.3.3.ebuild
+++ b/media-libs/freetype/freetype-2.3.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.3.ebuild,v 1.8 2007/05/09 01:31:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.3.ebuild,v 1.9 2007/05/09 14:53:05 dirtyepic Exp $
inherit eutils flag-o-matic libtool
@@ -72,9 +72,7 @@ src_unpack() {
### ft2demos ###
cd ../ft2demos-${PV}
- # fttimer demo does not require X11. fix linking appropriately.
- epatch "${FILESDIR}"/${P}-fttimer-noX.patch
-
+ epatch "${FILESDIR}"/${P}-ft2demos-Makefile.patch
sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile
# Disable tests needing X11 when USE="-X". (bug #177597)