[gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/, media-libs/libclxclient/
commit: 59e666c432e8bb8bd6763c1912804d0b5a5b1eac
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Nov 17 16:53:25 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Nov 17 16:53:41 2019 +
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 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 000..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
++#include "clxclient.h"
+ #include
+
+
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() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/, media-libs/libclxclient/
commit: ffa817ffe2e955013d42febbdcda273178a772bb
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Nov 17 14:16:59 2019 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Nov 17 14:17:15 2019 +
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 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 000..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 000..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 "
+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
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libclxclient/files/
commit: ad77be6a466de0f197dd69f7bee35579345a22e3
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Jun 13 17:53:57 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Jun 13 21:14:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad77be6a
media-libs/libclxclient: remove unused patches
.../files/libclxclient-1.0.1-gcc41.patch | 31 --
.../files/libclxclient-1.0.1-makefile.patch| 30 --
.../files/libclxclient-3.3.2-Makefile.patch| 32 ---
.../files/libclxclient-3.6.1-Makefile.patch| 37 --
4 files changed, 130 deletions(-)
diff --git a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
b/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
deleted file mode 100644
index 12f4d5df456..000
--- a/media-libs/libclxclient/files/libclxclient-1.0.1-gcc41.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index c254e5f1e05..000
--- a/media-libs/libclxclient/files/libclxclient-1.0.1-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 +=
-
-
-@@ -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)
-- /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/files/libclxclient-3.3.2-Makefile.patch
b/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch
deleted file mode 100644
index 59e55f38a49..000
--- a/media-libs/libclxclient/files/libclxclient-3.3.2-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
Makefile.orig 2007-01-05 05:21:48.0 -0800
-+++ Makefile 2007-01-05 05:26:44.0 -0800
-@@ -28,8 +28,7 @@
- DISTDIR = clxclient-$(VERSION)
-
-
--CPPFLAGS += -Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic
-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2
--LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
-+CPPFLAGS += -Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -fpic
-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
- LDLIBS +=
-
-
-@@ -43,15 +42,13 @@
-
-
- $(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)
-- /usr/bin/install -d $(PREFIX)/$(LIBDIR)
-- /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
-- /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
-- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
-- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
-+ /usr/bin/install -D $(CLXCLIENT_H)
