* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/, media-libs/lib3ds/files/
@ 2019-10-01 21:52 James Le Cuirot
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot @ 2019-10-01 21:52 UTC (permalink / raw
To: gentoo-commits
commit: 0cee691cfcab77711088553ac81f452ad8c31f9c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 1 21:43:22 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 21:52:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cee691c
media-libs/lib3ds: EAPI 7
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/lib3ds-2.0.0_rc1-underlinking.patch | 56 ----------------------
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 23 +++++++++
2 files changed, 23 insertions(+), 56 deletions(-)
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
deleted file mode 100644
index b9001af2993..00000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 158cf6f8deaac69eba0c5941f809469cc3eefb43
-Author: hasufell <hasufell@gentoo.org>
-Date: Thu Sep 26 20:49:01 2013 +0200
-
- fix underlinking
-
-diff --git a/configure.in b/configure.in
-index 7bf17c2..fa5bd3f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -16,6 +16,8 @@ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION)
- AC_PROG_CC
- AC_PROG_LIBTOOL
-
-+AC_CHECK_LIBM
-+
- AC_OUTPUT([ \
- lib3ds-config \
- Makefile \
-diff --git a/examples/3ds2obj/Makefile.am b/examples/3ds2obj/Makefile.am
-index 8213225..4214675 100644
---- a/examples/3ds2obj/Makefile.am
-+++ b/examples/3ds2obj/Makefile.am
-@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = 3ds2obj
- 3ds2obj_SOURCES = 3ds2obj.c
-
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
-
- EXTRA_DIST = 3ds2obj.vcproj
-diff --git a/examples/3dsdump/Makefile.am b/examples/3dsdump/Makefile.am
-index 98ec5d1..ef19b04 100644
---- a/examples/3dsdump/Makefile.am
-+++ b/examples/3dsdump/Makefile.am
-@@ -3,6 +3,6 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = 3dsdump
- 3dsdump_SOURCES = 3dsdump.c
-
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
-
- EXTRA_DIST = 3dsdump.vcproj
-diff --git a/examples/cube/Makefile.am b/examples/cube/Makefile.am
-index c79c0ee..539813d 100644
---- a/examples/cube/Makefile.am
-+++ b/examples/cube/Makefile.am
-@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/src
- bin_PROGRAMS = cube
- cube_SOURCES = cube.c
-
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la $(LIBM)
-
- EXTRA_DIST = cube.vcproj cube.tga
-
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
new file mode 100644
index 00000000000..c8e2db13f63
--- /dev/null
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="20080909"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
+HOMEPAGE="https://code.google.com/p/lib3ds/"
+SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
+)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/, media-libs/lib3ds/files/
@ 2022-03-20 21:55 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-03-20 21:55 UTC (permalink / raw
To: gentoo-commits
commit: c486d45e663d50280ff5b72f95d33661ab72279a
Author: Jannik Glückert <jannik.glueckert <AT> gmail <DOT> com>
AuthorDate: Fri Mar 18 12:16:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:54:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c486d45e
media-libs/lib3ds: always call eautoreconf (old libtool has clang bug)
Closes: https://bugs.gentoo.org/835577
Signed-off-by: Jannik Glückert <jannik.glueckert <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...b3ds-2.0.0_rc1-underlinking-no-autoreconf.patch | 45 ----------------------
media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 9 +++++
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 11 ++++--
3 files changed, 17 insertions(+), 48 deletions(-)
diff --git a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch b/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
deleted file mode 100644
index af9040883c10..000000000000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 562d1412a705b6667bc9fa594133366fb7e787ab
-Author: hasufell <hasufell@gentoo.org>
-Date: Thu Sep 26 20:49:44 2013 +0200
-
- avoid autoreconf
-
-diff --git a/examples/3ds2obj/Makefile.in b/examples/3ds2obj/Makefile.in
-index 1b5b1fe..d2fda8a 100644
---- a/examples/3ds2obj/Makefile.in
-+++ b/examples/3ds2obj/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3ds2obj_SOURCES = 3ds2obj.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3ds2obj.vcproj
- all: all-am
-
-diff --git a/examples/3dsdump/Makefile.in b/examples/3dsdump/Makefile.in
-index 4c915cc..f9f7bba 100644
---- a/examples/3dsdump/Makefile.in
-+++ b/examples/3dsdump/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- 3dsdump_SOURCES = 3dsdump.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = 3dsdump.vcproj
- all: all-am
-
-diff --git a/examples/cube/Makefile.in b/examples/cube/Makefile.in
-index 76b7946..1c4b5b6 100644
---- a/examples/cube/Makefile.in
-+++ b/examples/cube/Makefile.in
-@@ -180,7 +180,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I$(top_srcdir)/src
- cube_SOURCES = cube.c
--LDADD = $(top_builddir)/src/lib3ds.la
-+LDADD = $(top_builddir)/src/lib3ds.la -lm
- EXTRA_DIST = cube.vcproj cube.tga
- all: all-am
-
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index 22bfc9ac8e31..d5158e9289e8 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit autotools
+
DESCRIPTION="library for managing 3D-Studio Release 3 and 4 .3DS files"
HOMEPAGE="https://code.google.com/p/lib3ds/"
SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
@@ -18,6 +20,13 @@ PATCHES=(
"${FILESDIR}"/${P}-mesh.c.patch
)
+src_prepare() {
+ default
+
+ # Always eautoreconf to renew libtool (e.g. Clang)
+ eautoreconf
+}
+
src_configure() {
econf $(use_enable static-libs static)
}
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
index b7da0c9e8a8c..653a994cfb71 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit autotools
+
MY_PV="20080909"
MY_P="${PN}-${MY_PV}"
@@ -18,9 +20,12 @@ BDEPEND="app-arch/unzip"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-)
+src_prepare() {
+ default
+
+ # Always eautoreconf to renew libtool (e.g. Clang)
+ eautoreconf
+}
src_configure() {
econf $(use_enable static-libs static)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-20 21:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-01 21:52 [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/, media-libs/lib3ds/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2022-03-20 21:55 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox