public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/, media-libs/libclxclient/
@ 2019-11-17 14:17 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2019-11-17 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     ffa817ffe2e955013d42febbdcda273178a772bb
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 14:16:59 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 14:17:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa817ff

media-libs/libclxclient-3.9.2: bump

1) updated to eapi 7 + updates
2) updated deps
3) updated Makefile patch

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/libclxclient/Manifest                   |  1 +
 .../files/libclxclient-3.9.2-Makefile.patch        | 35 ++++++++++++++++
 media-libs/libclxclient/libclxclient-3.9.2.ebuild  | 47 ++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/media-libs/libclxclient/Manifest b/media-libs/libclxclient/Manifest
index bf59f38df10..d79a9b187c6 100644
--- a/media-libs/libclxclient/Manifest
+++ b/media-libs/libclxclient/Manifest
@@ -1 +1,2 @@
 DIST clxclient-3.9.0.tar.bz2 30272 BLAKE2B 51d7dbbf6e474b849461aaedb859bc92da0cb56f368e631016cfcb7dae1e5b3dca7630f35bc2d608fe8851cb5e60be599933834bbe358e092f2b08ad97cdc659 SHA512 4bbd621ceeebf3dfc36f0a3d02c63ba1c0e818e691e5c9681e737710824f53a58c682fb2475a7a2bba4f2dfd520166b782977320ceb73de39448cf512e26c842
+DIST clxclient-3.9.2.tar.bz2 29991 BLAKE2B ffd56894e0bcf09e2b6e4c882830e3c3a3a88f3778fe6a2c8b2ceb9336f8ce9cf28193da8e8c86987475e95e3ea2c07319bd82e88ad820b39167cfba9eefd7c3 SHA512 38c2782e58df24c2dfcb936fc9cfe4d44016055fb1aa52ef8e789bf8ec327f45f2f7a91f18012e4b0c6f253f6f10329d6d1e9fc341017ace3f2b6fa050592049

diff --git a/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch b/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
new file mode 100644
index 00000000000..e79dce5764e
--- /dev/null
+++ b/media-libs/libclxclient/files/libclxclient-3.9.2-Makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/source/Makefile b/source/Makefile
+index 177115f..c8fa0f5 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -24,16 +24,16 @@ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86
+ PREFIX ?= /usr/local
+ INCDIR ?= $(PREFIX)/include
+ LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
++PKGCONFIG = pkg-config
+ 
+ MAJVERS = 3
+ MINVERS = 9.2
+ VERSION = $(MAJVERS).$(MINVERS)
+ 
+ 
+-CPPFLAGS += $(shell pkgconf --cflags freetype2) 
++CPPFLAGS += $(shell ${PKGCONFIG} --cflags freetype2) 
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL)
+-CXXFLAGS += -Wall -O2 -fPIC 
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC 
+ LDLIBS +=
+ 
+ 
+@@ -55,8 +55,8 @@ install:	$(CLXCLIENT_MIN)
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(INCDIR)
+ 	install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
+-	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
++	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_MAJ)
++	ln -sf $(CLXCLIENT_MAJ) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
+ 
+ uninstall:
+ 	rm -rf $(DESTDIR)$(INCDIR)/$(CLXCLIENT_H)

diff --git a/media-libs/libclxclient/libclxclient-3.9.2.ebuild b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
new file mode 100644
index 00000000000..610b5cbc408
--- /dev/null
+++ b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+CDEPEND="
+	media-libs/freetype:2
+	media-libs/libclthreads
+	x11-libs/libX11
+	x11-libs/libXft
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S="${WORKDIR}/clxclient-${PV}"
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+)
+
+src_compile() {
+	tc-export CXX
+	local prefix="${EPREFIX}/usr"
+	cd "${S}/source"
+	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	default
+
+	local prefix="${ED}/usr"
+	cd "${S}/source"
+	emake INCDIR="${prefix}/include" LIBDIR="${prefix}/$(get_libdir)" PKGCONFIG="$(tc-getPKG_CONFIG)" install
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/, media-libs/libclxclient/
@ 2019-11-17 16:53 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2019-11-17 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     59e666c432e8bb8bd6763c1912804d0b5a5b1eac
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 16:53:25 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 16:53:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e666c4

media-libs/libclxclient-3.9.2: fixed include in enumip.cc

Closes: https://bugs.gentoo.org/700370
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/libclxclient-3.9.2-enumip-include-fix.patch       | 13 +++++++++++++
 media-libs/libclxclient/libclxclient-3.9.2.ebuild           |  1 +
 2 files changed, 14 insertions(+)

diff --git a/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch b/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
new file mode 100644
index 00000000000..710baac0db5
--- /dev/null
+++ b/media-libs/libclxclient/files/libclxclient-3.9.2-enumip-include-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/source/enumip.cc b/source/enumip.cc
+index 0873da8..1cdac0d 100644
+--- a/source/enumip.cc
++++ b/source/enumip.cc
+@@ -19,7 +19,7 @@
+ // ---------------------------------------------------------------------------------
+ 
+ 
+-#include <clxclient.h>
++#include "clxclient.h"
+ #include <X11/keysym.h>
+ 
+ 

diff --git a/media-libs/libclxclient/libclxclient-3.9.2.ebuild b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
index 610b5cbc408..718a4139a14 100644
--- a/media-libs/libclxclient/libclxclient-3.9.2.ebuild
+++ b/media-libs/libclxclient/libclxclient-3.9.2.ebuild
@@ -29,6 +29,7 @@ DOCS=( AUTHORS )
 
 PATCHES=(
 	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-enumip-include-fix.patch"
 )
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-11-17 16:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-17 14:17 [gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/, media-libs/libclxclient/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2019-11-17 16:53 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox