* [gentoo-commits] gentoo-x86 commit in media-libs/libmikmod: ChangeLog libmikmod-3.2.0-r1.ebuild
@ 2013-03-16 10:49 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-16 10:49 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/16 10:49:49
Modified: ChangeLog
Added: libmikmod-3.2.0-r1.ebuild
Log:
Port to multilib-minimal.eclass and ABI_X86="32" to replace the existing copy in app-emulation/emul-linux-x86-soundlibs.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.105 media-libs/libmikmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?r1=1.104&r2=1.105
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog 16 Jan 2013 07:56:57 -0000 1.104
+++ ChangeLog 16 Mar 2013 10:49:48 -0000 1.105
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/libmikmod
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.104 2013/01/16 07:56:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.105 2013/03/16 10:49:48 ssuominen Exp $
+
+*libmikmod-3.2.0-r1 (16 Mar 2013)
+
+ 16 Mar 2013; Samuli Suominen <ssuominen@gentoo.org>
+ +libmikmod-3.2.0-r1.ebuild:
+ Port to multilib-minimal.eclass and ABI_X86="32" to replace the existing copy
+ in app-emulation/emul-linux-x86-soundlibs.
16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
-libmikmod-3.1.12-r1.ebuild, -files/libmikmod-3.1.12-64bit.patch,
1.1 media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.1&content-type=text/plain
Index: libmikmod-3.2.0-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.1 2013/03/16 10:49:48 ssuominen Exp $
EAPI=5
inherit autotools eutils multilib-minimal
DESCRIPTION="A library to play a wide range of module formats"
HOMEPAGE="http://mikmod.shlomifish.org/"
SRC_URI="http://mikmod.shlomifish.org/files/${P}.tar.gz"
LICENSE="LGPL-2+ LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+alsa coreaudio oss static-libs"
REQUIRED_USE="|| ( alsa oss coreaudio )"
RDEPEND="alsa? ( media-libs/alsa-lib:= )
!${CATEGORY}/${PN}:2"
DEPEND="${RDEPEND}
oss? ( virtual/os-headers )"
ECONF_SOURCE=${S}
src_prepare() {
EPATCH_SOURCE="${FILESDIR}"/${PV} EPATCH_SUFFIX=patch epatch
eautoreconf
}
multilib_src_configure() {
econf \
$(use_enable alsa) \
--disable-nas \
$(use_enable coreaudio osx) \
$(use_enable oss) \
$(use_enable static-libs static)
}
multilib_src_install() {
emake DESTDIR="${D}" install
dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
cat <<-EOF > "${T}"/${PN}.pc
prefix=/usr
exec_prefix=\${prefix}
libdir=/usr/$(get_libdir)
includedir=\${prefix}/include
Name: ${PN}
Description: ${DESCRIPTION}
Version: ${PV}
Libs: -L\${libdir} -lmikmod
Libs.private: -ldl -lm
Cflags: -I\${includedir} $("${ED}"/usr/bin/libmikmod-config --cflags)
EOF
insinto /usr/$(get_libdir)/pkgconfig
doins "${T}"/${PN}.pc
}
multilib_src_install_all() {
dodoc AUTHORS NEWS README TODO
dohtml docs/*.html
prune_libtool_files
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libmikmod: ChangeLog libmikmod-3.2.0-r1.ebuild
@ 2013-06-27 18:11 Alexis Ballier (aballier)
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-27 18:11 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/27 18:11:02
Modified: ChangeLog libmikmod-3.2.0-r1.ebuild
Log:
Add missing MULTILIB_USEDEP on alsa-lib. Add altivec, debug and threads useflags. Disable dlopening its libraries and link to them instead: We have tools to detect breakage in case its linked, it is more complicated with dlopen.
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.108 media-libs/libmikmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?r1=1.107&r2=1.108
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog 3 May 2013 14:28:34 -0000 1.107
+++ ChangeLog 27 Jun 2013 18:11:02 -0000 1.108
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/libmikmod
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.107 2013/05/03 14:28:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.108 2013/06/27 18:11:02 aballier Exp $
+
+ 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
+ Add missing MULTILIB_USEDEP on alsa-lib. Add altivec, debug and threads
+ useflags. Disable dlopening its libraries and link to them instead: We have
+ tools to detect breakage in case its linked, it is more complicated with
+ dlopen.
03 May 2013; Samuli Suominen <ssuominen@gentoo.org> libmikmod-3.2.0.ebuild,
libmikmod-3.2.0-r1.ebuild:
1.3 media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?r1=1.2&r2=1.3
Index: libmikmod-3.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmikmod-3.2.0-r1.ebuild 3 May 2013 14:28:34 -0000 1.2
+++ libmikmod-3.2.0-r1.ebuild 27 Jun 2013 18:11:02 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.2 2013/05/03 14:28:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.3 2013/06/27 18:11:02 aballier Exp $
EAPI=5
inherit autotools eutils multilib-minimal
@@ -12,11 +12,11 @@
LICENSE="LGPL-2+ LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa coreaudio oss static-libs"
+IUSE="+alsa altivec coreaudio debug oss static-libs +threads"
REQUIRED_USE="|| ( alsa oss coreaudio )"
-RDEPEND="alsa? ( media-libs/alsa-lib:= )
+RDEPEND="alsa? ( media-libs/alsa-lib:=[${MULTILIB_USEDEP}] )
!${CATEGORY}/${PN}:2"
DEPEND="${RDEPEND}
oss? ( virtual/os-headers )"
@@ -32,16 +32,23 @@
multilib_src_configure() {
econf \
$(use_enable alsa) \
+ $(use_enable altivec) \
+ $(use_enable debug) \
--disable-nas \
$(use_enable coreaudio osx) \
$(use_enable oss) \
- $(use_enable static-libs static)
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ --disable-dl
}
multilib_src_install() {
emake DESTDIR="${D}" install
dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
+ local libs="$("${ED}"/usr/bin/libmikmod-config --libs)"
+ local privlibs="${libs#*lmikmod}"
+
cat <<-EOF > "${T}"/${PN}.pc
prefix=/usr
exec_prefix=\${prefix}
@@ -50,8 +57,8 @@
Name: ${PN}
Description: ${DESCRIPTION}
Version: ${PV}
- Libs: -L\${libdir} -lmikmod
- Libs.private: -ldl -lm
+ Libs: ${libs%${privlibs}}
+ Libs.private: ${privlibs}
Cflags: -I\${includedir} $("${ED}"/usr/bin/libmikmod-config --cflags)
EOF
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libmikmod: ChangeLog libmikmod-3.2.0-r1.ebuild
@ 2013-06-27 18:20 Alexis Ballier (aballier)
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-27 18:20 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/27 18:20:10
Modified: ChangeLog libmikmod-3.2.0-r1.ebuild
Log:
add a blocker on emul-linux-soundlibs
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.109 media-libs/libmikmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?r1=1.108&r2=1.109
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ChangeLog 27 Jun 2013 18:11:02 -0000 1.108
+++ ChangeLog 27 Jun 2013 18:20:10 -0000 1.109
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libmikmod
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.108 2013/06/27 18:11:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.109 2013/06/27 18:20:10 aballier Exp $
+
+ 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
+ add a blocker on emul-linux-soundlibs
27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
Add missing MULTILIB_USEDEP on alsa-lib. Add altivec, debug and threads
1.4 media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?r1=1.3&r2=1.4
Index: libmikmod-3.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmikmod-3.2.0-r1.ebuild 27 Jun 2013 18:11:02 -0000 1.3
+++ libmikmod-3.2.0-r1.ebuild 27 Jun 2013 18:20:10 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.3 2013/06/27 18:11:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.4 2013/06/27 18:20:10 aballier Exp $
EAPI=5
inherit autotools eutils multilib-minimal
@@ -17,7 +17,9 @@
REQUIRED_USE="|| ( alsa oss coreaudio )"
RDEPEND="alsa? ( media-libs/alsa-lib:=[${MULTILIB_USEDEP}] )
- !${CATEGORY}/${PN}:2"
+ !${CATEGORY}/${PN}:2
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
oss? ( virtual/os-headers )"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libmikmod: ChangeLog libmikmod-3.2.0-r1.ebuild
@ 2013-06-27 18:39 Alexis Ballier (aballier)
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier (aballier) @ 2013-06-27 18:39 UTC (permalink / raw
To: gentoo-commits
aballier 13/06/27 18:39:09
Modified: ChangeLog libmikmod-3.2.0-r1.ebuild
Log:
Hardcode Libs in the .pc file since libmikmod-config is really broken: it gives -L/usr/lib64 as soon as it exists...
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.110 media-libs/libmikmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/ChangeLog?r1=1.109&r2=1.110
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog 27 Jun 2013 18:20:10 -0000 1.109
+++ ChangeLog 27 Jun 2013 18:39:09 -0000 1.110
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libmikmod
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.109 2013/06/27 18:20:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.110 2013/06/27 18:39:09 aballier Exp $
+
+ 27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
+ Hardcode Libs in the .pc file since libmikmod-config is really broken: it
+ gives -L/usr/lib64 as soon as it exists...
27 Jun 2013; Alexis Ballier <aballier@gentoo.org> libmikmod-3.2.0-r1.ebuild:
add a blocker on emul-linux-soundlibs
1.5 media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild?r1=1.4&r2=1.5
Index: libmikmod-3.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmikmod-3.2.0-r1.ebuild 27 Jun 2013 18:20:10 -0000 1.4
+++ libmikmod-3.2.0-r1.ebuild 27 Jun 2013 18:39:09 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.4 2013/06/27 18:20:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0-r1.ebuild,v 1.5 2013/06/27 18:39:09 aballier Exp $
EAPI=5
inherit autotools eutils multilib-minimal
@@ -59,7 +59,7 @@
Name: ${PN}
Description: ${DESCRIPTION}
Version: ${PV}
- Libs: ${libs%${privlibs}}
+ Libs: -L${EPREFIX}/usr/$(get_libdir) -lmikmod
Libs.private: ${privlibs}
Cflags: -I\${includedir} $("${ED}"/usr/bin/libmikmod-config --cflags)
EOF
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-27 18:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-27 18:20 [gentoo-commits] gentoo-x86 commit in media-libs/libmikmod: ChangeLog libmikmod-3.2.0-r1.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2013-06-27 18:39 Alexis Ballier (aballier)
2013-06-27 18:11 Alexis Ballier (aballier)
2013-03-16 10:49 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox