| [proaudio] [934] add ~amd64 keyworded libtar for hydrogen-9999, (try to) fix hydrogen-9999 build - eqmake4 etc.. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 934
Author: gimpel
Date: 2007-10-30 15:10:16 +0000 (Tue, 30 Oct 2007)
Log Message:
-----------
add ~amd64 keyworded libtar for hydrogen-9999, (try to) fix hydrogen-9999 build - eqmake4 etc..
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/hydrogen/Manifest
trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild
trunk/overlays/proaudio/media-sound/rezound/Manifest
trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/dev-libs/libtar/
trunk/overlays/proaudio/dev-libs/libtar/Manifest
trunk/overlays/proaudio/dev-libs/libtar/files/
trunk/overlays/proaudio/dev-libs/libtar/files/digest-libtar-1.2.11-r1
trunk/overlays/proaudio/dev-libs/libtar/files/libtar-1.2.11-memleak.patch
trunk/overlays/proaudio/dev-libs/libtar/libtar-1.2.11-r1.ebuild
Added: trunk/overlays/proaudio/dev-libs/libtar/Manifest
===================================================================
--- trunk/overlays/proaudio/dev-libs/libtar/Manifest (rev 0)
+++ trunk/overlays/proaudio/dev-libs/libtar/Manifest 2007-10-30 15:10:16 UTC (rev 934)
@@ -0,0 +1,12 @@
+AUX libtar-1.2.11-memleak.patch 2974 RMD160 6124aba523a366d2ebbe7801bc514e0748589704 SHA1 2c5aa519d02715ce3174c8997377abd5984399df SHA256 b01e052f4dba94beef78e22403c6f73b7329cda751be713982d5fb43614c3fb3
+MD5 6693572efd424d17b6e4ac938b38fda5 files/libtar-1.2.11-memleak.patch 2974
+RMD160 6124aba523a366d2ebbe7801bc514e0748589704 files/libtar-1.2.11-memleak.patch 2974
+SHA256 b01e052f4dba94beef78e22403c6f73b7329cda751be713982d5fb43614c3fb3 files/libtar-1.2.11-memleak.patch 2974
+DIST libtar-1.2.11.tar.gz 145354 RMD160 205d1213ed32f9708fb2135010afdd9e184c430e SHA1 9611f23024b0e89aad1cfea301122186b3c160f8 SHA256 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8
+EBUILD libtar-1.2.11-r1.ebuild 593 RMD160 f74e0711fd780c1ac69d85073cc501697febdea0 SHA1 db051685dddfa3f67e9bdbe0457c289cc270effe SHA256 705869765ba1f3ff7bc6680fd717493b59d78ce5a0a0af9286154d83bbe6410e
+MD5 b2386827fe199ff8a8f04f3981011689 libtar-1.2.11-r1.ebuild 593
+RMD160 f74e0711fd780c1ac69d85073cc501697febdea0 libtar-1.2.11-r1.ebuild 593
+SHA256 705869765ba1f3ff7bc6680fd717493b59d78ce5a0a0af9286154d83bbe6410e libtar-1.2.11-r1.ebuild 593
+MD5 539e9230f81b29d1eeb78b128ac52e80 files/digest-libtar-1.2.11-r1 176
+RMD160 7f5d0725062cf1a234d77476a2b7cb58d4170065 files/digest-libtar-1.2.11-r1 176
+SHA256 88380d12d2651b067cc18079b692ef5dd9eac77c21aefa0693afa20a636ae428 files/digest-libtar-1.2.11-r1 176
Added: trunk/overlays/proaudio/dev-libs/libtar/files/digest-libtar-1.2.11-r1
===================================================================
--- trunk/overlays/proaudio/dev-libs/libtar/files/digest-libtar-1.2.11-r1 (rev 0)
+++ trunk/overlays/proaudio/dev-libs/libtar/files/digest-libtar-1.2.11-r1 2007-10-30 15:10:16 UTC (rev 934)
@@ -0,0 +1,2 @@
+RMD160 205d1213ed32f9708fb2135010afdd9e184c430e libtar-1.2.11.tar.gz 145354
+SHA256 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8 libtar-1.2.11.tar.gz 145354
Added: trunk/overlays/proaudio/dev-libs/libtar/files/libtar-1.2.11-memleak.patch
===================================================================
--- trunk/overlays/proaudio/dev-libs/libtar/files/libtar-1.2.11-memleak.patch (rev 0)
+++ trunk/overlays/proaudio/dev-libs/libtar/files/libtar-1.2.11-memleak.patch 2007-10-30 15:10:16 UTC (rev 934)
@@ -0,0 +1,114 @@
+Seems libtar likes to leak memory. Lets plug it.
+
+Patch by Per Lid\xE9n http://www.fukt.bth.se/~per/
+https://lists.feep.net:8080/pipermail/libtar/index.html
+http://bugs.gentoo.org/show_bug.cgi?id=82858
+
+Problem with patch: doesn't appear to be thread safe, but oh well,
+not like the functions are named with _r suffixes ;).
+
+--- libtar-1.2.11-orig/lib/decode.c
++++ libtar-1.2.11/lib/decode.c
+@@ -26,7 +26,7 @@
+ char *
+ th_get_pathname(TAR *t)
+ {
+- char filename[MAXPATHLEN];
++ static char filename[MAXPATHLEN];
+
+ if (t->th_buf.gnu_longname)
+ return t->th_buf.gnu_longname;
+@@ -35,11 +35,11 @@
+ {
+ snprintf(filename, sizeof(filename), "%.155s/%.100s",
+ t->th_buf.prefix, t->th_buf.name);
+- return strdup(filename);
++ return filename;
+ }
+
+ snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name);
+- return strdup(filename);
++ return filename;
+ }
+
+
+--- libtar-1.2.11-orig/lib/extract.c
++++ libtar-1.2.11/lib/extract.c
+@@ -28,14 +28,6 @@
+ #endif
+
+
+-struct linkname
+-{
+- char ln_save[MAXPATHLEN];
+- char ln_real[MAXPATHLEN];
+-};
+-typedef struct linkname linkname_t;
+-
+-
+ static int
+ tar_set_file_perms(TAR *t, char *realname)
+ {
+@@ -98,7 +90,9 @@
+ tar_extract_file(TAR *t, char *realname)
+ {
+ int i;
+- linkname_t *lnp;
++ char *lnp;
++ int pathname_len;
++ int realname_len;
+
+ if (t->options & TAR_NOOVERWRITE)
+ {
+@@ -137,11 +131,13 @@
+ if (i != 0)
+ return i;
+
+- lnp = (linkname_t *)calloc(1, sizeof(linkname_t));
++ pathname_len = strlen(th_get_pathname(t)) + 1;
++ realname_len = strlen(realname) + 1;
++ lnp = (char *)calloc(1, pathname_len + realname_len);
+ if (lnp == NULL)
+ return -1;
+- strlcpy(lnp->ln_save, th_get_pathname(t), sizeof(lnp->ln_save));
+- strlcpy(lnp->ln_real, realname, sizeof(lnp->ln_real));
++ strcpy(&lnp[0], th_get_pathname(t));
++ strcpy(&lnp[pathname_len], realname);
+ #ifdef DEBUG
+ printf("tar_extract_file(): calling libtar_hash_add(): key=\"%s\", "
+ "value=\"%s\"\n", th_get_pathname(t), realname);
+@@ -288,7 +284,7 @@
+ {
+ char *filename;
+ char *linktgt = NULL;
+- linkname_t *lnp;
++ char *lnp;
+ libtar_hashptr_t hp;
+
+ if (!TH_ISLNK(t))
+@@ -304,8 +300,8 @@
+ if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
+ (libtar_matchfunc_t)libtar_str_match) != 0)
+ {
+- lnp = (linkname_t *)libtar_hashptr_data(&hp);
+- linktgt = lnp->ln_real;
++ lnp = (char *)libtar_hashptr_data(&hp);
++ linktgt = &lnp[strlen(lnp) + 1];
+ }
+ else
+ linktgt = th_get_linkname(t);
+--- libtar-1.2.11-orig/lib/libtar.h
++++ libtar-1.2.11/lib/libtar.h
+@@ -63,9 +63,9 @@
+ /***** handle.c ************************************************************/
+
+ typedef int (*openfunc_t)(const char *, int, ...);
+-typedef int (*closefunc_t)(int);
+-typedef ssize_t (*readfunc_t)(int, void *, size_t);
+-typedef ssize_t (*writefunc_t)(int, const void *, size_t);
++typedef int (*closefunc_t)(long);
++typedef ssize_t (*readfunc_t)(long, void *, size_t);
++typedef ssize_t (*writefunc_t)(long, const void *, size_t);
+
+ typedef struct
+ {
Added: trunk/overlays/proaudio/dev-libs/libtar/libtar-1.2.11-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/dev-libs/libtar/libtar-1.2.11-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/dev-libs/libtar/libtar-1.2.11-r1.ebuild 2007-10-30 15:10:16 UTC (rev 934)
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="C library for manipulating POSIX tar files"
+HOMEPAGE="http://www.feep.net/libtar/";
+SRC_URI="ftp://ftp.feep.net/pub/software/libtar/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-memleak.patch
+ sed -i '/INSTALL_PROGRAM/s: -s$::' */Makefile.in
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+ dodoc ChangeLog README TODO
+}
Modified: trunk/overlays/proaudio/media-sound/hydrogen/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/Manifest 2007-10-29 16:33:25 UTC (rev 933)
+++ trunk/overlays/proaudio/media-sound/hydrogen/Manifest 2007-10-30 15:10:16 UTC (rev 934)
@@ -23,10 +23,10 @@
MD5 30fb9d9eb7a962c61bcf0e488898acec hydrogen-0.9.3-r1.ebuild 3362
RMD160 fddf2197663eaf0308967863aa2ad6c06a744b7f hydrogen-0.9.3-r1.ebuild 3362
SHA256 8d7f30a697ec634b61520a6d7c9a201b9b279aa19b931a2772012d9edfa5b7a2 hydrogen-0.9.3-r1.ebuild 3362
-EBUILD hydrogen-9999.ebuild 1373 RMD160 b586bbf6a783566345144eb622cbab9848326c13 SHA1 dc34384ee10dfd24fe21c60ec79716f29616c152 SHA256 830a6970e6836179f336d4c30d8ce234050526c7a4b1e78a0df6a48d0553567a
-MD5 042c9e01186a429be2e5960a889af17b hydrogen-9999.ebuild 1373
-RMD160 b586bbf6a783566345144eb622cbab9848326c13 hydrogen-9999.ebuild 1373
-SHA256 830a6970e6836179f336d4c30d8ce234050526c7a4b1e78a0df6a48d0553567a hydrogen-9999.ebuild 1373
+EBUILD hydrogen-9999.ebuild 1329 RMD160 52ea244f20f5a08686a8eac9261c6b38b08d4e86 SHA1 9c1a849d2d13ea56c138def063977a884dfd2519 SHA256 2c6732d640e226d76e35d8d070fca1e2f7f73161b2b6362eee024f001440bb22
+MD5 c0cf50272072d462b46b3020a3552121 hydrogen-9999.ebuild 1329
+RMD160 52ea244f20f5a08686a8eac9261c6b38b08d4e86 hydrogen-9999.ebuild 1329
+SHA256 2c6732d640e226d76e35d8d070fca1e2f7f73161b2b6362eee024f001440bb22 hydrogen-9999.ebuild 1329
MD5 1a0871d2c47e8e3a837dc56ce9b1db6b files/digest-hydrogen-0.9.3-r1 247
RMD160 ebb239e261e5aad2c35b176c983fef7cce1827ab files/digest-hydrogen-0.9.3-r1 247
SHA256 85dd02bd475c60bde105e175bef2b0e8c7ef2519d003f2cbf2c6df1ebb793d65 files/digest-hydrogen-0.9.3-r1 247
Modified: trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild 2007-10-29 16:33:25 UTC (rev 933)
+++ trunk/overlays/proaudio/media-sound/hydrogen/hydrogen-9999.ebuild 2007-10-30 15:10:16 UTC (rev 934)
@@ -30,18 +30,16 @@
src_unpack() {
subversion_src_unpack
cd "${S}"
- epatch "${FILESDIR}/${P}-configure.patch"
- cd gui/src/widgets/
- esed_check -i -e 's|QSvgRenderer|Qt/QSvgRenderer|g' Button.cpp
- cd -
+ esed_check -i -e 's|QSvgRenderer|Qt/QSvgRenderer|g' gui/src/widgets/Button.cpp
+
+ # fake config.h
+ echo "#define CONFIG_PREFIX \"/usr\"" >> config.h
+ echo "#define DATA_PATH \"/usr/share/hydrogen/data\"" >> config.h
}
src_compile() {
- # maybe let's remove that patch ^^ and use 'qmake all.pro prefix=/usr' in
- # future
- unset QTDIR
- prefix=/usr ./configure || die "configure failed"
- emake || die "emake failed"
+ eqmake4 all.pro
+ emake -j1 || die "emake failed"
}
src_install() {
Modified: trunk/overlays/proaudio/media-sound/rezound/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/Manifest 2007-10-29 16:33:25 UTC (rev 933)
+++ trunk/overlays/proaudio/media-sound/rezound/Manifest 2007-10-30 15:10:16 UTC (rev 934)
@@ -18,10 +18,10 @@
MD5 3bc1175bcfa6d88bbe86f84556db560c files/undefined-functions.patch 1084
RMD160 4a2086423af2571cfb863ca95ec500a0e627527f files/undefined-functions.patch 1084
SHA256 3093932261d232f81ca3bccdbccc258e932e85525f1b2d277b4a7b58c752ab27 files/undefined-functions.patch 1084
-EBUILD rezound-9999.ebuild 2960 RMD160 0daf1bb95b3033a102a16ed42ba1e75fc0ee1205 SHA1 fdc26ea9208e0db84019d0cee0cfce16f52a10d3 SHA256 613451d7b4dbafe21cd7bef3117e5acbe09d9beceb7029afd17b43c59c05dd07
-MD5 95819396655b3980f04c89b66ff52b82 rezound-9999.ebuild 2960
-RMD160 0daf1bb95b3033a102a16ed42ba1e75fc0ee1205 rezound-9999.ebuild 2960
-SHA256 613451d7b4dbafe21cd7bef3117e5acbe09d9beceb7029afd17b43c59c05dd07 rezound-9999.ebuild 2960
+EBUILD rezound-9999.ebuild 2850 RMD160 e8a32c0014c382127bd31ed7ea8e2234268ddfc7 SHA1 a37dd60015d69ad0583bd56d6f4b50222b03476d SHA256 38839429f144eed0d6a39cfa56cc676dbb8063f0fe1f07692e10d0fcef0b76c4
+MD5 2b939794ee9e43557a927ae3cd57ec18 rezound-9999.ebuild 2850
+RMD160 e8a32c0014c382127bd31ed7ea8e2234268ddfc7 rezound-9999.ebuild 2850
+SHA256 38839429f144eed0d6a39cfa56cc676dbb8063f0fe1f07692e10d0fcef0b76c4 rezound-9999.ebuild 2850
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-rezound-9999 0
RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-rezound-9999 0
SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-rezound-9999 0
Modified: trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild 2007-10-29 16:33:25 UTC (rev 933)
+++ trunk/overlays/proaudio/media-sound/rezound/rezound-9999.ebuild 2007-10-30 15:10:16 UTC (rev 934)
@@ -33,11 +33,6 @@
soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
vorbis? ( media-libs/libvorbis media-libs/libogg )"
-# optional packages (don't need to be installed during emerge):
-#
-# >=media-sound/lame-3.92
-# app-cdr/cdrdao
-
DEPEND="${RDEPEND}
sys-devel/autoconf
sys-devel/automake