diff options
Diffstat (limited to 'media-sound/gmtp')
| -rw-r--r-- | media-sound/gmtp/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch | 29 | ||||
| -rw-r--r-- | media-sound/gmtp/gmtp-1.3.1-r300.ebuild | 7 |
3 files changed, 38 insertions, 4 deletions
diff --git a/media-sound/gmtp/ChangeLog b/media-sound/gmtp/ChangeLog index 513782a5fefc..413434c54d62 100644 --- a/media-sound/gmtp/ChangeLog +++ b/media-sound/gmtp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gmtp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/ChangeLog,v 1.9 2012/05/25 07:53:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/ChangeLog,v 1.10 2012/06/01 18:11:19 vapier Exp $ + + 01 Jun 2012; Mike Frysinger <vapier@gentoo.org> + +files/gmtp-1.3.1-pkg-config.patch, gmtp-1.3.1-r300.ebuild: + Respect $PKG_CONFIG, and fix linking with gthread. 25 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gmtp-1.2.0.ebuild, -files/gmtp-1.2.0-makefile-gentoo.patch, -gmtp-1.3.0.ebuild, diff --git a/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch b/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch new file mode 100644 index 000000000000..20290c067f2c --- /dev/null +++ b/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch @@ -0,0 +1,29 @@ +https://sourceforge.net/p/gmtp/discussion/requests/thread/ce4152cc/ + +respect $(PKG_CONFIG), and add missing gthread-2.0 + +--- a/Makefile ++++ b/Makefile +@@ -42,14 +42,18 @@ LIBS += + + .SUFFIXES: .c .o .po .mo + +-GTK_CFLAGS = `pkg-config --cflags gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile` +-GTK_LDFLAGS = `pkg-config --libs gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile` ++PKG_CONFIG ?= pkg-config + + ifeq ($(MAKECMDGOALS),gtk3) +-GTK_CFLAGS = `pkg-config --cflags gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile` +-GTK_LDFLAGS = `pkg-config --libs gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile` ++PKGS = gtk+-3.0 gio-2.0 + CFLAGS += -DGMTP_USE_GTK3 ++else ++PKGS = gtk+-2.0 gconf-2.0 + endif ++PKGS += gthread-2.0 libmtp id3tag flac vorbisfile ++ ++GTK_CFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)` ++GTK_LDFLAGS = `$(PKG_CONFIG) --libs $(PKGS)` + + objects = src/main.o src/mtp.o src/interface.o src/callbacks.o src/prefs.o src/dnd.o src/metatag_info.o + headers = src/main.h src/mtp.h src/interface.h src/callbacks.h src/prefs.h src/dnd.h src/metatag_info.h src/config.h diff --git a/media-sound/gmtp/gmtp-1.3.1-r300.ebuild b/media-sound/gmtp/gmtp-1.3.1-r300.ebuild index 9119e5babb20..bbf355ae6637 100644 --- a/media-sound/gmtp/gmtp-1.3.1-r300.ebuild +++ b/media-sound/gmtp/gmtp-1.3.1-r300.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.1-r300.ebuild,v 1.1 2012/05/25 07:52:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.1-r300.ebuild,v 1.2 2012/06/01 18:11:19 vapier Exp $ EAPI=4 -inherit gnome2-utils toolchain-funcs +inherit gnome2-utils toolchain-funcs eutils DESCRIPTION="A simple MTP client for MP3 players" HOMEPAGE="http://gmtp.sourceforge.net/" @@ -27,6 +27,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/gMTP src_prepare() { + epatch "${FILESDIR}"/${P}-pkg-config.patch sed -i \ -e '/CFLAGS/s:-g::' \ -e '/glib-compile-schemas/d' \ @@ -34,7 +35,7 @@ src_prepare() { } src_compile() { - emake gtk3 CC="$(tc-getCC)" + emake gtk3 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } src_install() { |