diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-06 14:59:01 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-06 14:59:01 +0000 |
commit | d20d04d5544fa67acceb38f230e9e085e4b7d263 (patch) | |
tree | 51fbadbfa97fc423feefd2a769d74a05e1025c7a /media-libs/libclxclient | |
parent | Stable on sparc wrt #125111 (diff) | |
download | historical-d20d04d5544fa67acceb38f230e9e085e4b7d263.tar.gz historical-d20d04d5544fa67acceb38f230e9e085e4b7d263.tar.bz2 historical-d20d04d5544fa67acceb38f230e9e085e4b7d263.zip |
Respect multilib libdir, don't run ldconfig, use CXX to build, drop virtual/libc dependency, fix dependencies for modular X, add patch to build with GCC 4.1.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'media-libs/libclxclient')
-rw-r--r-- | media-libs/libclxclient/ChangeLog | 13 | ||||
-rw-r--r-- | media-libs/libclxclient/Manifest | 32 | ||||
-rw-r--r-- | media-libs/libclxclient/files/digest-libclxclient-1.0.0 | 1 | ||||
-rw-r--r-- | media-libs/libclxclient/files/libclxclient-1.0.0-makefile.patch | 26 | ||||
-rw-r--r-- | media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch | 31 | ||||
-rw-r--r-- | media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch | 38 | ||||
-rw-r--r-- | media-libs/libclxclient/libclxclient-1.0.0.ebuild | 30 | ||||
-rw-r--r-- | media-libs/libclxclient/libclxclient-1.0.1.ebuild | 22 | ||||
-rw-r--r-- | media-libs/libclxclient/metadata.xml | 8 |
9 files changed, 102 insertions, 99 deletions
diff --git a/media-libs/libclxclient/ChangeLog b/media-libs/libclxclient/ChangeLog index 4124d16f868d..202132c342d1 100644 --- a/media-libs/libclxclient/ChangeLog +++ b/media-libs/libclxclient/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-libs/libclxclient -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libclxclient/ChangeLog,v 1.7 2005/08/24 16:01:23 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libclxclient/ChangeLog,v 1.8 2006/03/06 14:59:01 flameeyes Exp $ + + 06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/libclxclient-1.0.0-makefile.patch, + +files/libclxclient-1.0.1-gcc41.patch, + files/libclxclient-1.0.1-makefile.patch, metadata.xml, + -libclxclient-1.0.0.ebuild, libclxclient-1.0.1.ebuild: + Respect multilib libdir, don't run ldconfig, use CXX to build, drop + virtual/libc dependency, fix dependencies for modular X, add patch to build + with GCC 4.1. 24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> libclxclient-1.0.0.ebuild, libclxclient-1.0.1.ebuild: diff --git a/media-libs/libclxclient/Manifest b/media-libs/libclxclient/Manifest index 4a76cae61221..66287bf21df9 100644 --- a/media-libs/libclxclient/Manifest +++ b/media-libs/libclxclient/Manifest @@ -1,18 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 64f9aa7104d8a2ccf54032f9d238dab3 ChangeLog 1256 -MD5 cef7e83b32153a9f7e7dc559c62ed6cf libclxclient-1.0.1.ebuild 788 -MD5 ae2f0ce6b633cd6e8ea199bdabb85098 metadata.xml 227 -MD5 a618c818698cdb24a571c92d00be2277 libclxclient-1.0.0.ebuild 785 -MD5 2de3383c26084e6501926b8c8fd9adfb files/libclxclient-1.0.1-makefile.patch 863 +MD5 bd85fe91de17146ab591c50bc4fbba06 ChangeLog 1673 +RMD160 de2a73cd1bb67de5b958e7c09cd7920665f4c787 ChangeLog 1673 +SHA256 47361e739397cc71fdf55cb8ce6644be5996488ea537bac560a2d8bee7e30f0b ChangeLog 1673 MD5 04e32b8b7e18ab98b65e207950ea73af files/digest-libclxclient-1.0.1 67 -MD5 0e0fa6de7f1df54bd29e84d83f2f961c files/digest-libclxclient-1.0.0 67 -MD5 2de3383c26084e6501926b8c8fd9adfb files/libclxclient-1.0.0-makefile.patch 863 +RMD160 cad25d9521713a2d7847061bd57d0029c872e35c files/digest-libclxclient-1.0.1 67 +SHA256 a72723a148f822f8e927590f653c47474ea20ff75cb351d454219335502455e1 files/digest-libclxclient-1.0.1 67 +MD5 f2ed0101f56731ad43c01a11cf197704 files/libclxclient-1.0.1-gcc41.patch 1027 +RMD160 5a72dd9fa941c8222101c8fc9e36e983db991abb files/libclxclient-1.0.1-gcc41.patch 1027 +SHA256 e1da6351bf077f785421e1ff1a32eeecf880ef6c211eabb691e3913bc22d27fc files/libclxclient-1.0.1-gcc41.patch 1027 +MD5 7e38634086f6608b2ebefcdf0afaf49f files/libclxclient-1.0.1-makefile.patch 1057 +RMD160 e8130198db115a463687869e7c8608c6a8d1398d files/libclxclient-1.0.1-makefile.patch 1057 +SHA256 3b5014b49f0227a250128c2206ee6923787a92ea219be3c7cd84d8ee2db82fdd files/libclxclient-1.0.1-makefile.patch 1057 +MD5 4620f975a9f8b57eaaeeaa8329dedebd libclxclient-1.0.1.ebuild 973 +RMD160 e319389f15c13b96e8ea93b9998007155e09b785 libclxclient-1.0.1.ebuild 973 +SHA256 269b04e21914bb8d9f2bda3b775c94be2e62f253ec7e6c3fb94385439dd2db40 libclxclient-1.0.1.ebuild 973 +MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217 +RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217 +SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 metadata.xml 217 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFDDJnuj5H05b2HAEkRAnnoAJ9k53D2kLNutMKyjvjgoHnCB9Ho5QCbB3jA -eN3oxfuPJJIMwmBgbi9MBVs= -=ymgO +iD8DBQFEDE4lAiZjviIA2XgRAu1hAJ9nZT0Me/rYtYIUev5inLa9OeyxcwCgnYTH +CfY6x+nAgwNLbfrQpF1Fzrc= +=HwEC -----END PGP SIGNATURE----- diff --git a/media-libs/libclxclient/files/digest-libclxclient-1.0.0 b/media-libs/libclxclient/files/digest-libclxclient-1.0.0 deleted file mode 100644 index 82f5b98ea485..000000000000 --- a/media-libs/libclxclient/files/digest-libclxclient-1.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 5c26e12ed63980bab932cdb6964f946a clxclient-1.0.0.tar.bz2 16403 diff --git a/media-libs/libclxclient/files/libclxclient-1.0.0-makefile.patch b/media-libs/libclxclient/files/libclxclient-1.0.0-makefile.patch deleted file mode 100644 index 4c03fe19adf5..000000000000 --- a/media-libs/libclxclient/files/libclxclient-1.0.0-makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- clxclient-1.0.0.orig/Makefile 2004-08-24 00:41:48.080726216 +0200 -+++ clxclient-1.0.0/Makefile 2004-08-24 00:43:09.451356000 +0200 -@@ -3,10 +3,8 @@ - LDLIBS += - - --#CLXCLIENT_LIBDIR = /usr/local/lib --#CLXCLIENT_INCDIR = /usr/local/include --CLXCLIENT_LIBDIR = /usr/lib --CLXCLIENT_INCDIR = /usr/include -+CLXCLIENT_LIBDIR = ${DESTDIR}/usr/lib -+CLXCLIENT_INCDIR = ${DESTDIR}/usr/include - CLXCLIENT_SO = libclxclient.so - CLXCLIENT_MAJ = $(CLXCLIENT_SO).1 - CLXCLIENT_MIN = $(CLXCLIENT_MAJ).0.0 -@@ -21,8 +19,8 @@ - - - install: $(CLXCLIENT_MIN) -- cp -f $(CLXCLIENT_H) $(CLXCLIENT_INCDIR) -- cp -f $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR) -+ install -D $(CLXCLIENT_H) $(CLXCLIENT_INCDIR)/$(CLXCLIENT_H) -+ install -D $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN) - /sbin/ldconfig -n $(CLXCLIENT_LIBDIR) - ln -sf $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) - diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch new file mode 100644 index 000000000000..12f4d5df4565 --- /dev/null +++ b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch @@ -0,0 +1,31 @@ +Index: clxclient-1.0.1/clxclient.h +=================================================================== +--- clxclient-1.0.1.orig/clxclient.h ++++ clxclient-1.0.1/clxclient.h +@@ -75,7 +75,7 @@ class X_hints + { + public: + +- X_hints::X_hints (void) { _sh.flags = 0; _mh.flags = 0; _ch.res_name = 0; _ch.res_class = 0; } ++ X_hints (void) { _sh.flags = 0; _mh.flags = 0; _ch.res_name = 0; _ch.res_class = 0; } + + void position (int x, int y); + void minsize (int x, int y); +@@ -187,7 +187,7 @@ public: + X_resman (const X_resman&); + X_resman& operator=(const X_resman&); + +- void X_resman::init (int *argc, char *argv [], char *name, ++ void init (int *argc, char *argv [], char *name, + XrmOptionDescRec *opt, int nopt); + + const char *get (const char *res, const char *def) const; +@@ -205,7 +205,7 @@ private: + char *_home; + XrmDatabase _xrmdata; + +- static XrmOptionDescRec X_resman::defopt [X_resman::NDEFOPT]; ++ static XrmOptionDescRec defopt [X_resman::NDEFOPT]; + }; + + diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch b/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch index 4c03fe19adf5..c254e5f1e05f 100644 --- a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch +++ b/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch @@ -1,26 +1,30 @@ ---- clxclient-1.0.0.orig/Makefile 2004-08-24 00:41:48.080726216 +0200 -+++ clxclient-1.0.0/Makefile 2004-08-24 00:43:09.451356000 +0200 -@@ -3,10 +3,8 @@ +Index: clxclient-1.0.1/Makefile +=================================================================== +--- clxclient-1.0.1.orig/Makefile ++++ clxclient-1.0.1/Makefile +@@ -1,5 +1,5 @@ + CPPFLAGS += -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L/usr/X11R6/lib ++LDFLAGS += LDLIBS += --#CLXCLIENT_LIBDIR = /usr/local/lib --#CLXCLIENT_INCDIR = /usr/local/include --CLXCLIENT_LIBDIR = /usr/lib --CLXCLIENT_INCDIR = /usr/include -+CLXCLIENT_LIBDIR = ${DESTDIR}/usr/lib -+CLXCLIENT_INCDIR = ${DESTDIR}/usr/include - CLXCLIENT_SO = libclxclient.so - CLXCLIENT_MAJ = $(CLXCLIENT_SO).1 - CLXCLIENT_MIN = $(CLXCLIENT_MAJ).0.0 -@@ -21,8 +19,8 @@ +@@ -17,14 +17,13 @@ CLXCLIENT_H = clxclient.h + + + $(CLXCLIENT_MIN): $(CLXCLIENT_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) install: $(CLXCLIENT_MIN) - cp -f $(CLXCLIENT_H) $(CLXCLIENT_INCDIR) - cp -f $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR) -+ install -D $(CLXCLIENT_H) $(CLXCLIENT_INCDIR)/$(CLXCLIENT_H) -+ install -D $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN) - /sbin/ldconfig -n $(CLXCLIENT_LIBDIR) - ln -sf $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) +- /sbin/ldconfig -n $(CLXCLIENT_LIBDIR) +- ln -sf $(CLXCLIENT_MIN) $(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) ++ install -D $(CLXCLIENT_H) $(DESTDIR)$(CLXCLIENT_INCDIR)/$(CLXCLIENT_H) ++ install -D $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_MIN) ++ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(CLXCLIENT_LIBDIR)/$(CLXCLIENT_SO) + + clean: diff --git a/media-libs/libclxclient/libclxclient-1.0.0.ebuild b/media-libs/libclxclient/libclxclient-1.0.0.ebuild deleted file mode 100644 index d81f46440513..000000000000 --- a/media-libs/libclxclient/libclxclient-1.0.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libclxclient/libclxclient-1.0.0.ebuild,v 1.4 2005/08/24 16:01:23 flameeyes Exp $ - -IUSE="" - -inherit eutils - -S="${WORKDIR}/clxclient-${PV}" - -DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>" -HOMEPAGE="http://users.skynet.be/solaris/linuxaudio" -SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/clxclient-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc x86" - -DEPEND="virtual/libc - virtual/x11 - >=media-libs/libclthreads-1.0.0" - -src_compile() { - epatch "${FILESDIR}/${P}-makefile.patch" - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" -} diff --git a/media-libs/libclxclient/libclxclient-1.0.1.ebuild b/media-libs/libclxclient/libclxclient-1.0.1.ebuild index 3d0e47a4c930..d1d855acf9ce 100644 --- a/media-libs/libclxclient/libclxclient-1.0.1.ebuild +++ b/media-libs/libclxclient/libclxclient-1.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libclxclient/libclxclient-1.0.1.ebuild,v 1.4 2005/08/24 16:01:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libclxclient/libclxclient-1.0.1.ebuild,v 1.5 2006/03/06 14:59:01 flameeyes Exp $ IUSE="" -inherit eutils +inherit eutils multilib toolchain-funcs S="${WORKDIR}/clxclient-${PV}" @@ -16,15 +16,21 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc sparc x86" -DEPEND="virtual/libc - virtual/x11 +RDEPEND="|| ( x11-libs/libX11 virtual/x11 ) >=media-libs/libclthreads-1.0.1" -src_compile() { +src_unpack() { + unpack ${A} + cd ${S} epatch "${FILESDIR}/${P}-makefile.patch" - emake || die + epatch "${FILESDIR}/${P}-gcc41.patch" +} + +src_compile() { + tc-export CC CXX + emake || die "emake failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + make CLXCLIENT_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed" } diff --git a/media-libs/libclxclient/metadata.xml b/media-libs/libclxclient/metadata.xml index 0edf584ed3a0..d8913263a79e 100644 --- a/media-libs/libclxclient/metadata.xml +++ b/media-libs/libclxclient/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sound</herd> - <maintainer> - <email>sound@gentoo.org</email> - </maintainer> +<herd>sound</herd> +<maintainer> +<email>sound@gentoo.org</email> +</maintainer> </pkgmetadata> |