[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/, media-libs/lib3ds/files/
commit: c486d45e663d50280ff5b72f95d33661ab72279a
Author: Jannik Glückert gmail com>
AuthorDate: Fri Mar 18 12:16:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 20 21:54:59 2022 +
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 gmail.com>
Signed-off-by: Sam James 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..
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking-no-autoreconf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 562d1412a705b6667bc9fa594133366fb7e787ab
-Author: hasufell
-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)
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: d50180c617f86d2b3f6218b84252f8fd46a42e34
Author: Sam James gentoo org>
AuthorDate: Sun Mar 20 21:54:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 20 21:55:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50180c6
media-libs/lib3ds: tidy up variable order
Signed-off-by: Sam James gentoo.org>
media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 3 ++-
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index d5158e9289e8..a2a9fdb2ba6c 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,6 +8,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;
+
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
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 653a994cfb71..54f706d22467 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,6 +11,7 @@ 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 ~arm ~arm64 ppc ppc64 x86"
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 3f62eb36b7660ee1364dd1ff026e8200adc1e1c9
Author: Sam James gentoo org>
AuthorDate: Mon Apr 5 15:10:15 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 5 15:10:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f62eb36
media-libs/lib3ds: fix .la file removal
Closes: https://bugs.gentoo.org/780024
Signed-off-by: Sam James gentoo.org>
media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 4 ++--
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index d9f40c14c6c..22bfc9ac8e3 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,6 +26,6 @@ src_install() {
default
if ! use static-libs; then
- rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+ find "${ED}" -name '*.la' -delete || die
fi
}
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 e8423a28d6c..b7da0c9e8a8 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -30,6 +30,6 @@ src_install() {
default
if ! use static-libs; then
- rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+ find "${ED}" -name '*.la' -delete || die
fi
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 320b62739339382814ccae3ee28b34e260e48fa7
Author: Sam James gentoo org>
AuthorDate: Mon Feb 22 07:12:35 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 22 07:12:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320b6273
media-libs/lib3ds: Keyword 2.0.0_rc1-r1 arm, #556758
Signed-off-by: Sam James gentoo.org>
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 d5322d7ca6e..e8423a28d6c 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
IUSE="static-libs"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: b6eadebb054950260f69e37e3d2a4775b97510a7 Author: Dennis Lamm gentoo org> AuthorDate: Sun Feb 7 23:04:57 2021 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Feb 7 23:56:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6eadebb media-libs/lib3ds: metadata fixed indentation QA violation Signed-off-By: Dennis Lamm gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/19367 Signed-off-by: Dennis Lamm gentoo.org> media-libs/lib3ds/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/lib3ds/metadata.xml b/media-libs/lib3ds/metadata.xml index d12952a5a0e..7279deaa80a 100644 --- a/media-libs/lib3ds/metadata.xml +++ b/media-libs/lib3ds/metadata.xml @@ -12,7 +12,7 @@ 3dpr...@gentoo.org Gentoo 3D print - - https://code.google.com/archive/p/lib3ds/issues - + +https://code.google.com/archive/p/lib3ds/issues +
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: bb9e3e81e96e50330e4bf30a2795da60bf60de55 Author: Dennis Lamm gentoo org> AuthorDate: Sun Feb 7 21:11:14 2021 + Commit: Dennis Lamm gentoo org> CommitDate: Sun Feb 7 23:56:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb9e3e81 media-libs/lib3ds: metadata added upstream bugtracker Signed-off-by: Dennis Lamm gentoo.org> media-libs/lib3ds/metadata.xml | 25 ++--- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/media-libs/lib3ds/metadata.xml b/media-libs/lib3ds/metadata.xml index a5cdd6731a6..d12952a5a0e 100644 --- a/media-libs/lib3ds/metadata.xml +++ b/media-libs/lib3ds/metadata.xml @@ -1,15 +1,18 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - amy...@gentoo.org - - - ga...@gentoo.org - Gentoo Games Project - - - 3dpr...@gentoo.org - Gentoo 3D print - + +amy...@gentoo.org + + +ga...@gentoo.org +Gentoo Games Project + + +3dpr...@gentoo.org +Gentoo 3D print + + + https://code.google.com/archive/p/lib3ds/issues +
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 68307e02f2296ed0cac2bf61614888fca8c62674
Author: Aaron Bauman gentoo org>
AuthorDate: Tue Dec 1 23:46:18 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Wed Dec 2 00:31:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68307e02
media-libs/lib3ds: drop old
Signed-off-by: Aaron Bauman gentoo.org>
media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild | 24
media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild | 29 -
2 files changed, 53 deletions(-)
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
b/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
deleted file mode 100644
index a15221ea080..000
--- a/media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils
-
-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;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/freeglut
- virtual/opengl"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-PATCHES=(
- "${FILESDIR}"/${P}-pkgconfig.patch
- "${FILESDIR}"/${P}-mesh.c.patch
-)
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
deleted file mode 100644
index 2c964c8ca15..000
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="media-libs/freeglut
- virtual/opengl"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-src_prepare() {
-# epatch "${FILESDIR}"/${P}-underlinking.patch
- epatch "${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: a3de018c8d1d669bfbdd8cd29e0a20e7f77ccd6e
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Oct 1 22:57:56 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Oct 1 22:57:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3de018c
media-libs/lib3ds: stable 2.0.0_rc1-r1 for ppc
stable wrt bug #745153
Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 d803af19cca..559f7bec4e7 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ppc ppc64 ~x86"
IUSE="static-libs"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 3bee809445168dea7144fa038c073b196ab801b7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Oct 1 22:57:51 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Oct 1 22:57:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bee8094
media-libs/lib3ds: stable 1.3.0-r2 for ppc
stable wrt bug #745153
Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index 408499e1039..968e1a9fdc1 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/;
SRC_URI="https://${PN}.googlecode.com/files/${P}.zip;
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
IUSE="static-libs"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 59b57ddf89269f019aae06ea42f9670c92adc5b3
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Oct 1 22:45:02 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Oct 1 22:55:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b57ddf
media-libs/lib3ds: stable 1.3.0-r2 for ppc64
stable wrt bug #745153
Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
index a6db6a0139e..408499e1039 100644
--- a/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
+++ b/media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://code.google.com/p/lib3ds/;
SRC_URI="https://${PN}.googlecode.com/files/${P}.zip;
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~x86"
IUSE="static-libs"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 64b68ba918440895559f572da288f2a334fa082f
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Oct 1 22:45:10 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Oct 1 22:55:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64b68ba9
media-libs/lib3ds: stable 2.0.0_rc1-r1 for ppc64
stable wrt bug #745153
Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 b663c12a29c..d803af19cca 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86"
IUSE="static-libs"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/files/, media-libs/lib3ds/
commit: 82e6b1388337dbb3ccc7ed554d2a2d328ff9ac83
Author: James Le Cuirot gentoo org>
AuthorDate: Wed Oct 2 20:38:59 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Wed Oct 2 20:40:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e6b138
media-libs/lib3ds: Restore v1 and apply EAPI 7 plus other fixes
A bug in qgrep meant I didn't realise this version was in use. As it
turns out, media-libs/opencollada's dependency on v2 is bogus.
Forgot to mention before that I've dropped the freeglut and opengl
dependencies because they're not needed at all.
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
media-libs/lib3ds/Manifest | 1 +
media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch | 17
.../lib3ds/files/lib3ds-1.3.0-pkgconfig.patch | 94 ++
media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild | 24 ++
media-libs/lib3ds/lib3ds-1.3.0-r2.ebuild | 31 +++
5 files changed, 167 insertions(+)
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 3c8d779efec..3fda88065c6 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1 +1,2 @@
+DIST lib3ds-1.3.0.zip 443675 BLAKE2B
7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219
SHA512
7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
DIST lib3ds-20080909.zip 427233 BLAKE2B
862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f
SHA512
ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
new file mode 100644
index 000..1455660596b
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-mesh.c.patch
@@ -0,0 +1,17 @@
+diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c
+--- lib3ds-1.3.0.orig/lib3ds/mesh.c2007-06-20 19:04:08.0 +0200
lib3ds-1.3.0/lib3ds/mesh.c 2010-09-14 06:34:39.987807911 +0200
+@@ -87,8 +87,11 @@
+ faces=lib3ds_io_read_word(io);
+ for (i=0; ifaces);
+- strcpy(mesh->faceL[index].material, name);
++ if (indexfaces) {
++strncpy(mesh->faceL[index].material, name, 64);
++ } else {
++// TODO warning
++ }
+ }
+ }
+ break;
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
new file mode 100644
index 000..41f658e5311
--- /dev/null
+++ b/media-libs/lib3ds/files/lib3ds-1.3.0-pkgconfig.patch
@@ -0,0 +1,94 @@
+diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in
+--- lib3ds-1.2.0.orig/lib3ds-config.in 2000-05-23 14:13:08.0 +0200
lib3ds-1.2.0/lib3ds-config.in 2007-10-21 06:37:48.0 +0200
+@@ -1,9 +1,5 @@
+ #!/bin/sh
+
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-exec_prefix_set=no
+-
+ usage()
+ {
+ cat <&2
+ fi
+
++PKG_CONFIG_ARGS=
++
+ while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+@@ -30,23 +28,23 @@
+
+ case $1 in
+ --prefix=*)
+- prefix=$optarg
++ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg"
+ if test $exec_prefix_set = no ; then
+-exec_prefix=$optarg
++PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS
--define-variable=exec_prefix=$optarg"
+ fi
+ ;;
+ --prefix)
+ echo_prefix=yes
+ ;;
+ --exec-prefix=*)
+- exec_prefix=$optarg
++ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
+ exec_prefix_set=yes
+ ;;
+ --exec-prefix)
+ echo_exec_prefix=yes
+ ;;
+ --version)
+- echo @LIB3DS_VERSION@
++ pkg-config --modversion lib3ds
+ ;;
+ --cflags)
+ echo_cflags=yes
+@@ -62,23 +60,18 @@
+ done
+
+ if test "$echo_prefix" = "yes"; then
+- echo $prefix
++ pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds
+ fi
+
+ if test "$echo_exec_prefix" = "yes"; then
+- echo $exec_prefix
++ pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds
+ fi
+
+ if test "$echo_cflags" = "yes"; then
+- if test @includedir@ != /usr/include ; then
+-echo -I@includedir@
+- fi
++ pkg-config $PKG_CONFIG_ARGS --cflags lib3ds
+ fi
+
+ if test "$echo_libs" = "yes"; then
+- if test @libdir@ != /usr/lib ; then
+-my_linker_flags="-L@libdir@"
+- fi
+- echo ${my_linker_flags} -l3ds
+-fi
++ pkg-config $PKG_CONFIG_ARGS --libs lib3ds
++fi
+
+diff -uNr
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/files/, media-libs/lib3ds/
commit: 0c21aa91719e657db66aaa170ae3e0be77e99e50
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Oct 1 21:36:55 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Oct 1 21:52:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c21aa91
media-libs/lib3ds: Drop old 1.x
This package almost certainly should have been slotted. It is only
required by opencollada now and that expects 2.0.0_rc1.
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
media-libs/lib3ds/Manifest | 1 -
.../lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch | 17
.../lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch | 94 --
media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild | 24 --
4 files changed, 136 deletions(-)
diff --git a/media-libs/lib3ds/Manifest b/media-libs/lib3ds/Manifest
index 3fda88065c6..3c8d779efec 100644
--- a/media-libs/lib3ds/Manifest
+++ b/media-libs/lib3ds/Manifest
@@ -1,2 +1 @@
-DIST lib3ds-1.3.0.zip 443675 BLAKE2B
7e9aa3b7d0c74013264430be24b1f8417f5ff7754bd77508fb85fee227c8675c023b6b805b3cda57a1ea3c1bbc7b0fbd37df8ed1c4d00ac295a39ffb0e3c1219
SHA512
7c866ea9721a7a124c25b4962e933a7066ec2e3c7998e5ae2ba93727f19b91bdb103699bada6d1e04b67e0a54b9f58d09382093569114a1846d86bb03821b8ac
DIST lib3ds-20080909.zip 427233 BLAKE2B
862a4606206c59e357b0b8805998a497de140b5e80aa3f6f7dd41288ebb1ffc12475b41d5327ee3c619a22c549897b28b444bac5df58192979af5c236859d86f
SHA512
ba7166dbd9fb97edc0f5cf0df56747b7e3c5aa1e62334ca995020a6ccd77284abc58e3fba80ec96ecf3765f5ce3121612c9f8c7dfedb2322f1cd2af85d567f87
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
deleted file mode 100644
index 1455660596b..000
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-mesh.c.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur lib3ds-1.3.0.orig/lib3ds/mesh.c lib3ds-1.3.0/lib3ds/mesh.c
lib3ds-1.3.0.orig/lib3ds/mesh.c2007-06-20 19:04:08.0 +0200
-+++ lib3ds-1.3.0/lib3ds/mesh.c 2010-09-14 06:34:39.987807911 +0200
-@@ -87,8 +87,11 @@
- faces=lib3ds_io_read_word(io);
- for (i=0; ifaces);
-- strcpy(mesh->faceL[index].material, name);
-+ if (indexfaces) {
-+strncpy(mesh->faceL[index].material, name, 64);
-+ } else {
-+// TODO warning
-+ }
- }
- }
- break;
diff --git a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
b/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
deleted file mode 100644
index 41f658e5311..000
--- a/media-libs/lib3ds/files/lib3ds-1.3.0-r1-pkgconfig.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -uNr lib3ds-1.2.0.orig/lib3ds-config.in lib3ds-1.2.0/lib3ds-config.in
lib3ds-1.2.0.orig/lib3ds-config.in 2000-05-23 14:13:08.0 +0200
-+++ lib3ds-1.2.0/lib3ds-config.in 2007-10-21 06:37:48.0 +0200
-@@ -1,9 +1,5 @@
- #!/bin/sh
-
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--exec_prefix_set=no
--
- usage()
- {
- cat <&2
- fi
-
-+PKG_CONFIG_ARGS=
-+
- while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-@@ -30,23 +28,23 @@
-
- case $1 in
- --prefix=*)
-- prefix=$optarg
-+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=prefix=$optarg"
- if test $exec_prefix_set = no ; then
--exec_prefix=$optarg
-+PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS
--define-variable=exec_prefix=$optarg"
- fi
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
-- exec_prefix=$optarg
-+ PKG_CONFIG_ARGS="$PKG_CONFIG_ARGS --define-variable=exec_prefix=$optarg"
- exec_prefix_set=yes
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --version)
-- echo @LIB3DS_VERSION@
-+ pkg-config --modversion lib3ds
- ;;
- --cflags)
- echo_cflags=yes
-@@ -62,23 +60,18 @@
- done
-
- if test "$echo_prefix" = "yes"; then
-- echo $prefix
-+ pkg-config $PKG_CONFIG_ARGS --variable=prefix lib3ds
- fi
-
- if test "$echo_exec_prefix" = "yes"; then
-- echo $exec_prefix
-+ pkg-config $PKG_CONFIG_ARGS --variable=exec_prefix lib3ds
- fi
-
- if test "$echo_cflags" = "yes"; then
-- if test @includedir@ != /usr/include ; then
--echo -I@includedir@
-- fi
-+ pkg-config $PKG_CONFIG_ARGS --cflags lib3ds
- fi
-
- if test "$echo_libs" = "yes"; then
-- if test @libdir@ != /usr/lib ; then
--my_linker_flags="-L@libdir@"
-- fi
-- echo ${my_linker_flags} -l3ds
--fi
-+ pkg-config $PKG_CONFIG_ARGS --libs lib3ds
-+fi
-
-diff -uNr lib3ds-1.2.0.orig/lib3ds.pc.in lib3ds-1.2.0/lib3ds.pc.in
lib3ds-1.2.0.orig/lib3ds.pc.in 1970-01-01 01:00:00.0 +0100
-+++ lib3ds-1.2.0/lib3ds.pc.in 2007-10-21 06:23:53.0 +0200
-@@ -0,0 +1,11
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/, media-libs/lib3ds/files/
commit: 0cee691cfcab77711088553ac81f452ad8c31f9c
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Oct 1 21:43:22 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Oct 1 21:52:29 2019 +
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 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..000
--- a/media-libs/lib3ds/files/lib3ds-2.0.0_rc1-underlinking.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 158cf6f8deaac69eba0c5941f809469cc3eefb43
-Author: hasufell
-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 000..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
+)
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: 037b13f7bd0e5f1ab5a861f5f933db7d8f6effa1
Author: James Le Cuirot gentoo org>
AuthorDate: Tue Oct 1 21:51:38 2019 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Oct 1 21:52:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=037b13f7
media-libs/lib3ds: Conditionally install static libs with USE flag
Closes: https://bugs.gentoo.org/485552
Closes: https://github.com/gentoo/gentoo/pull/13084
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot gentoo.org>
media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
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 c8e2db13f63..b663c12a29c 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip;
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
+IUSE="static-libs"
BDEPEND="app-arch/unzip"
@@ -21,3 +21,15 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${P}-underlinking-no-autoreconf.patch
)
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ if ! use static-libs; then
+ rm "${ED}/usr/$(get_libdir)/${PN}.la" || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/lib3ds/
commit: e410fe562318ec480524fbbacd65cca119003688
Author: Roy Bamford gentoo org>
AuthorDate: Mon Aug 21 18:51:03 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 27 15:34:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e410fe56
media-libs/lib3ds: added ~arm64 keyword
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
index b2ab656a54d..2c964c8ca15 100644
--- a/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
+++ b/media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://lib3ds.googlecode.com/files/${MY_P}.zip;
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
IUSE=""
S=${WORKDIR}/${MY_P}
