diff options
| author |   Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-10-23 14:28:26 +0000 |
|---|---|---|
| committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2009-10-23 14:28:26 +0000 |
| commit | 70d123c536b11d0ca947b2f1739affa779c7138e (patch) | |
| tree | 6853b118c7faebd5184126ceef8ce582a72f81ea /media-plugins/vdr-graphtft | |
| parent | Stable for HPPA (bug #287239). (diff) | |
| download | historical-70d123c536b11d0ca947b2f1739affa779c7138e.tar.gz historical-70d123c536b11d0ca947b2f1739affa779c7138e.tar.bz2 historical-70d123c536b11d0ca947b2f1739affa779c7138e.zip | |
fixed compile for graphtft-fe
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-plugins/vdr-graphtft')
5 files changed, 52 insertions, 15 deletions
diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog index 2a928eb75edc..a5dc6a768626 100644 --- a/media-plugins/vdr-graphtft/ChangeLog +++ b/media-plugins/vdr-graphtft/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-graphtft # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.20 2009/10/22 15:46:59 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.21 2009/10/23 14:28:25 hd_brummy Exp $ + + 23 Oct 2009; Joerg Bornkessel <hd_brummy@gentoo.org> + vdr-graphtft-0.3.2.24.ebuild, files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff, + files/vdr-graphtft-0.3.2.24_makefile.diff: + fixed compile for graphtft-fe 22 Oct 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdr-graphtft-0.3.2.24_makefile.diff: diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest index 620b4f6ca989..65a06940db46 100644 --- a/media-plugins/vdr-graphtft/Manifest +++ b/media-plugins/vdr-graphtft/Manifest @@ -13,9 +13,9 @@ AUX vdr-graphtft-0.2.2-gcc44.patch 372 RMD160 6bec1f1b8a927d2dcf3cc3e336d90fb893 AUX vdr-graphtft-0.2.2-glibc210.patch 383 RMD160 ac86a5bee44b14ef588d36470f0476be7cd13199 SHA1 05c0397c610788b1f6c723f9c574392325e10974 SHA256 4bccc54bd40e50e318446ebd71cb9becdc6f144fbd73150e63dac39471932def AUX vdr-graphtft-0.2.2_gentoo.diff 4745 RMD160 d12c2534c43dcee008078efed3cea1fe2b28df46 SHA1 7972126b602cebf8838074084574c3e4db547e6c SHA256 096be610a66e32a839fdbcdc974efe8e6c19c854bda89800daa375834d943f7d AUX vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff 1510 RMD160 6bf209fc3ecdfbd0e398162b1e7cfeebb926ce4a SHA1 bb9e3c0200a9d120846869b57714941fb498ec01 SHA256 5d5274914de62d77ff4fcf5f32a6b12c74be721ce986cd17074c6e1a7947339b -AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2139 RMD160 adb715c9ec84a6d5b47e6e00e3ec5b8aa13aee2f SHA1 27ddbf299ad4643122581b8448dd08aa5912064f SHA256 d8dc60e3ba36d58692ac1505aa2960349abc539c5cd69e61850005b212d57411 +AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2903 RMD160 c87cb78c744955797231588b49dd883f4a8916b7 SHA1 74add8c610f22cdd91c8521fc26e4e42af4f0b86 SHA256 ef4e8dcecaa103c73b3f50d1e5c2ede2b9306f6dd5c000d84e6d64151c3cc864 AUX vdr-graphtft-0.3.2.24_gentoo.diff 4754 RMD160 57ecff3f499eabf828fe5187238325b43e165eea SHA1 55dad00159b65690220bd337716b4a6a47ca3412 SHA256 d55e03ebe3a1e50b50178be79746ce6db25afde401f7d94de708715df3bb4d68 -AUX vdr-graphtft-0.3.2.24_makefile.diff 1800 RMD160 35214dd5db0113f70b0d5ddf037aead6d09e8f49 SHA1 163d580d316ad9e3ece9c9103c593d1011a362f0 SHA256 3eb6e877a848f7aa22ed299d2dc91eabd4fddc2950bb2854a440607204332d04 +AUX vdr-graphtft-0.3.2.24_makefile.diff 2202 RMD160 9c89b2c4a1a6f1511e8185c9b3e8c771aea294d6 SHA1 a191da00e9a9cea2fb0043e55039e88987ea27f5 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0 DIST DeepBlue-horchi-0.0.11.tar.bz2 2016781 RMD160 200ee708ffa091eee849965c7604ce6fc30215d5 SHA1 3296ab697f9a30b3d02840b3837be626f9454cb4 SHA256 c8e34591e9d655b6b0fe00ad8c04db9b01955c9d677d918ee27552368c4a74d7 DIST DeepBlue-horchi-0.0.8.tar.bz2 1769355 RMD160 2b0db7c41d8c6a5cd08f2002a109e79070e39abf SHA1 9791631ed3e5cb64624331acbd90fd9df0cab848 SHA256 3eed407992789c63a9c776d8320e2c9fd238847916ef77fe2ac2719fa66a787c DIST vdr-graphtft-0.1.21.alpha.tar.bz2 153233 RMD160 105c95c2f6365a3b6b27b874da5cc44133343e0e SHA1 fbd2657759828ef61b39011579049e0f85693218 SHA256 8d2566c86216c42079be3a11f082cdb87670b4eaa75d487f6a8d56d576eaff5f @@ -23,14 +23,14 @@ DIST vdr-graphtft-0.2.2.tar.bz2 155507 RMD160 daf31f493cc440f2345b7a63a69706b8e8 DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 RMD160 2c767a7bf0cfa76592499953fe22141073e653ac SHA1 cc80e8b86865ec2547ad8103cac03d4ac7840a9b SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7 EBUILD vdr-graphtft-0.1.21_alpha-r1.ebuild 2624 RMD160 88dabb36f0a45a440eba058c664e6f5562764676 SHA1 310604896be7b938e596f89907d2c1dc84194d88 SHA256 31e04250c46913987ce4e47b36d9e56972c025d542b2dca8d82d37162d690cb5 EBUILD vdr-graphtft-0.2.2-r1.ebuild 2973 RMD160 5029f3d761bc72e18dbc176d7d9a52f06f826cd4 SHA1 fd702aea562e23533b5ff9d5d3052842f3341494 SHA256 7fcb3be7bdcf644aac7c9e52a6f74b36421d116fba3a7b9941e7dd9241f8ae15 -EBUILD vdr-graphtft-0.3.2.24.ebuild 3151 RMD160 79b174ecce9a444b5f2c1d21f7a95bedbdf60c2e SHA1 fa9b23a91d0da906967ca2d08c4bc9c74fbddec9 SHA256 6089f5f44f8a9d11433b139efb87983fee311a3764c2421a9c59db8011660c30 -MISC ChangeLog 4883 RMD160 6e65145fd9e3e558a8bdcaae92e00cd54bc1950f SHA1 e67dd91eeb81f36046e006d0d6fd48ff84192fa3 SHA256 507d8ede3963903c1eedb34f2bae57f1755e730bbd03e4e8df0454e19f645cd7 +EBUILD vdr-graphtft-0.3.2.24.ebuild 3044 RMD160 c4e8a8019e08ebb3dc49cf9106d7267c2eff2dc2 SHA1 eb231ca979aced8efc3cdc747e6ad66b9dc6baf3 SHA256 69051271b8b5b6868fc1a7f1787cc2a2e99b40a2b658347635627e6ade97e32f +MISC ChangeLog 5092 RMD160 2042aae404f7110cf937263974266f900d3709f2 SHA1 ec463306a2e250f9180763e1df9a9df0469d954f SHA256 030cda452e95f28b5900a45dfbfa13a065be2af354ab872479fc1a594f1bdba4 MISC metadata.xml 659 RMD160 3fd53b58573a60e87e1f2d78f0ec7de700121244 SHA1 85ba547e5e7cf18e3554b372b9c5ffa1e94c2002 SHA256 305a976d2549db15f2261c7415fd81a8d06ec93956cd10ed271096c7cf9ad5bb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFK4H56dn07HTTCgIoRAjRaAKCoqRcsZG8M3yZHSwZOmonke7+RygCePPZV -ghbc7Qz7J5YiRHoszWmDvoY= -=pl/y +iD8DBQFK4b2Qdn07HTTCgIoRAjwJAJ95FLEKM+2OE1CdnyASpTRbJxHhJwCeI9YD +T/mWBqiq8vrvmUbJj4vVVCw= +=C/Sz -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff index 90bc2405be3c..da23096138fe 100644 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff +++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_gcc-4.4.x.diff @@ -48,3 +48,25 @@ diff -urNad vdr-plugin-graphtft-0.3.2~rc2+svn20090728.2153/theme.c vdr-plugin-gr { tell(0, "Parsing of [%s] failed, missing bracket '}'", expression); return fail; +diff -Naur graphtft-24.orig/graphtft-fe/common.cc graphtft-24/graphtft-fe/common.cc +--- graphtft-24.orig/graphtft-fe/common.cc 2009-10-23 15:10:20.000000000 +0200 ++++ graphtft-24/graphtft-fe/common.cc 2009-10-23 15:11:11.000000000 +0200 +@@ -11,6 +11,7 @@ + #include <time.h> + #include <stdio.h> + #include <string.h> ++#include <stdint.h> + + #include <graphtft.hpp> + +diff -Naur graphtft-24.orig/graphtft-fe/graphtft.hpp graphtft-24/graphtft-fe/graphtft.hpp +--- graphtft-24.orig/graphtft-fe/graphtft.hpp 2009-10-23 15:10:20.000000000 +0200 ++++ graphtft-24/graphtft-fe/graphtft.hpp 2009-10-23 15:11:36.000000000 +0200 +@@ -16,6 +16,7 @@ + #include <X11/Xlib.h> + #include <Imlib2.h> + #include <string.h> ++#include <stdint.h> + + #define __FRONTEND + #include <../common.h> diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff index 5e9c3e885f30..f638be630069 100644 --- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff +++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.2.24_makefile.diff @@ -1,4 +1,5 @@ -Joerg Bornkessel <hd_brummy@g.o> 22 Aug 2009 +Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009 +Matthias Schwarzott <zzam@g.o> 23 Okt 2009 diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile --- graphtft-24.orig/Makefile 2009-10-21 21:53:56.000000000 +0200 +++ graphtft-24/Makefile 2009-10-21 21:57:24.000000000 +0200 @@ -52,3 +53,15 @@ diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefil AR = ar TARGET = graphtft-fe +diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile +--- graphtft-24.orig/graphtft-fe/Makefile 2009-10-23 16:20:43.000000000 +0200 ++++ graphtft-24/graphtft-fe/Makefile 2009-10-23 16:21:20.000000000 +0200 +@@ -17,7 +17,7 @@ + + all: + echo Build graphTFT Frontend +- @(make $(TARGET)) ++ @$(MAKE) $(TARGET) + + + $(TARGET): $(OBJECTS) diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild index c69c7e3fa8d9..fe5d8c60acc0 100644 --- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild +++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild,v 1.2 2009/10/22 15:05:04 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild,v 1.3 2009/10/23 14:28:25 hd_brummy Exp $ EAPI="2" @@ -29,8 +29,7 @@ DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft] >=media-video/ffmpeg-0.4.8_p20090201 imagemagick? ( media-gfx/imagemagick[png,jpeg] ) directfb? ( dev-libs/DirectFB ) - graphtft-fe? ( x11-libs/qt-gui:4 - media-libs/imlib2[png,jpeg,X] )" + graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )" RDEPEND="${DEPEND}" @@ -89,9 +88,7 @@ src_compile() { if use graphtft-fe; then cd "${S}"/graphtft-fe - sed -i build.sh -e "s:qmake-qt4:qmake:" - ./clean.sh - ./build.sh || die "build.sh failed" + emake fi } |