[gentoo-commits] repo/gentoo:master commit in: media-libs/openctm/files/, media-libs/openctm/

[gentoo-commits] repo/gentoo:master commit in: media-libs/openctm/files/, media-libs/openctm/

[Andreas Sturmlechner]

commit:     7ade71dda7a3415dc63134e2491578733c008e44
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  6 20:45:39 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 09:15:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ade71dd

media-libs/openctm: Drop 1.0.3 (r0), EAPI5--

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/openctm/Manifest                        |   1 -
 .../openctm/files/openctm-fix-makefiles.patch      | 191 ---------------------
 media-libs/openctm/files/openctm-no-strip.patch    |  34 ----
 media-libs/openctm/openctm-1.0.3.ebuild            |  45 -----
 4 files changed, 271 deletions(-)

diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 2ec444b8cda..91c50b4afff 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -1,2 +1 @@
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
-DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 BLAKE2B 446fedc14e646b7cfc0aaac2d4f9b224482d74bf4faadd866b7121392e3863e3e42fe57f35654d4e9d7c056b3b8069dfb4668660d97ce7266d7850026654a88c SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6

diff --git a/media-libs/openctm/files/openctm-fix-makefiles.patch b/media-libs/openctm/files/openctm-fix-makefiles.patch
deleted file mode 100644
index 540b3cfa84f..00000000000
--- a/media-libs/openctm/files/openctm-fix-makefiles.patch
+++ /dev/null
@@ -1,191 +0,0 @@
- Makefile.linux       | 18 ++++++++-------
- lib/Makefile.linux   | 23 ++++++++++++-------
- tools/Makefile.linux | 64 ++++++++++++++++++++--------------------------------
- 3 files changed, 50 insertions(+), 55 deletions(-)
-
-diff --git a/Makefile.linux b/Makefile.linux
-index 24ca137..51fc88c 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -47,19 +47,21 @@ documentation:
- 
- 
- # Installation settings
--LIBDIR  = /usr/lib/
--INCDIR  = /usr/local/include/
--BINDIR  = /usr/local/bin/
--MAN1DIR = /usr/local/share/man/man1/
--CP = cp
-+LIBDIR  = $(DESTDIR)/usr/@GENTOO_LIBDIR@/$(DEB_HOST_MULTIARCH)
-+INCDIR  = $(DESTDIR)/usr/include/
-+BINDIR  = $(DESTDIR)/usr/bin/
-+MAN1DIR = $(DESTDIR)/usr/share/man/man1/
-+CP = cp -P
- MKDIR = mkdir -p
- 
--install:
--	$(CP) lib/libopenctm.so $(LIBDIR)
-+$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR):
-+	mkdir -p "$@"
-+
-+install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR)
-+	$(CP) lib/libopenctm.so* $(LIBDIR)
- 	$(CP) lib/openctm.h $(INCDIR)
- 	$(CP) lib/openctmpp.h $(INCDIR)
- 	$(CP) tools/ctmconv $(BINDIR)
- 	$(CP) tools/ctmviewer $(BINDIR)
--	$(MKDIR) $(MAN1DIR)
- 	$(CP) doc/ctmconv.1 $(MAN1DIR)
- 	$(CP) doc/ctmviewer.1 $(MAN1DIR)
-diff --git a/lib/Makefile.linux b/lib/Makefile.linux
-index 7643127..1e622ec 100644
---- a/lib/Makefile.linux
-+++ b/lib/Makefile.linux
-@@ -27,13 +27,18 @@
- ###############################################################################
- 
- LZMADIR = liblzma
--CC = gcc
--CFLAGS = -O3 -W -Wall -c -fPIC -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM -std=c99 -pedantic
--CFLAGS_LZMA = -O3 -W -Wall -c -fPIC -DLZMA_PREFIX_CTM -std=c99 -pedantic
-+CC ?= gcc
-+CFLAGS += -W -Wall -c -fPIC -std=c99 -pedantic
-+INCDEF = -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM
-+INCDEF_LZMA = -DLZMA_PREFIX_CTM
- RM = rm -f
- DEPEND = $(CPP) -MM
- 
--DYNAMICLIB = libopenctm.so
-+VERSION = 1.0.3
-+SOVERSION = 1
-+LIBNAME = libopenctm.so
-+SONAME = $(LIBNAME).$(SOVERSION)
-+DYNAMICLIB = $(LIBNAME).$(VERSION)
- 
- OBJS = openctm.o \
-        stream.o \
-@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \
- all: $(DYNAMICLIB)
- 
- clean:
--	$(RM) $(DYNAMICLIB) $(OBJS) $(LZMA_OBJS)
-+	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)
- 
- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)
--	gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm
-+	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
-+	ln -s $(DYNAMICLIB) $(SONAME)
-+	ln -s $(DYNAMICLIB) $(LIBNAME)
- 
- %.o: %.c
--	$(CC) $(CFLAGS) $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF) $<
- 
- %.o: $(LZMADIR)/%.c
--	$(CC) $(CFLAGS_LZMA) $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF_LZMA) $<
- 
- depend:
- 	$(DEPEND) $(SRCS) $(LZMA_SRCS) > make.depend
-diff --git a/tools/Makefile.linux b/tools/Makefile.linux
-index fa3e6e5..46276d1 100644
---- a/tools/Makefile.linux
-+++ b/tools/Makefile.linux
-@@ -26,49 +26,50 @@
- ###############################################################################
- 
- OPENCTMDIR = ../lib
--GLEWDIR = glew
--JPEGDIR = jpeg
-+# Use system libs if possible
-+#GLEWDIR = glew
-+GLEWDIR = /usr/include/GL
-+#JPEGDIR = jpeg
- RPLYDIR = rply
--TINYXMLDIR = tinyxml
--ZLIBDIR = zlib
--PNGLITEDIR = pnglite
-+# rply in libvxl1-dev is version 1.1, we need v. 1.01
-+#RPLYDIR = /usr/include/vxl/rply
-+#TINYXMLDIR = tinyxml
-+#ZLIBDIR = zlib
-+#PNGLITEDIR = pnglite
- 
--CPP = g++
--CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
-+CXX ?= g++
-+CC ?= gcc
-+CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
- 
- MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
- CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
--CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o glew.o pnglite.o $(MESHOBJS)
-+CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o $(MESHOBJS)
- CTMBENCHOBJS = ctmbench.o systimer.o
- 
- all: ctmconv ctmviewer ctmbench
- 
- clean:
- 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
--	cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean
--	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean
--	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean
- 
--libopenctm.so: $(OPENCTMDIR)/libopenctm.so
--	cp $< $@
-+ctmconv: $(CTMCONVOBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
- 
--ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
-+ctmviewer: $(CTMVIEWEROBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
-+	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
-+	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
- 
--ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut `pkg-config --libs gtk+-2.0`
--
--ctmbench: $(CTMBENCHOBJS) libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
-+ctmbench: $(CTMBENCHOBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
- 
- %.o: %.cpp
--	$(CPP) $(CPPFLAGS) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
- 
- ctmconv.o: ctmconv.cpp systimer.h convoptions.h mesh.h meshio.h
- ctmviewer.o: ctmviewer.cpp common.h image.h systimer.h sysdialog.h mesh.h meshio.h phong_vert.h phong_frag.h icons/icon_open.h icons/icon_save.h icons/icon_help.h
- ctmbench.o: ctmbench.cpp systimer.h
- common.o: common.cpp common.h
--image.o: image.cpp image.h common.h $(JPEGDIR)/libjpeg.a
-+image.o: image.cpp image.h common.h
- systimer.o: systimer.cpp systimer.h
- sysdialog_gtk.o: sysdialog_gtk.cpp sysdialog.h
- convoptions.o: convoptions.cpp convoptions.h
-@@ -91,22 +92,7 @@ phong_frag.h: phong.frag bin2c
- 	./bin2c phong.frag phongFragSrc > $@
- 
- bin2c: bin2c.cpp
--	$(CPP) -Os -W -Wall -o $@ $<
--
--$(JPEGDIR)/libjpeg.a:
--	cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a
--
--$(ZLIBDIR)/libz.a:
--	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux
--
--glew.o: $(GLEWDIR)/glew.c
--	gcc -c -Os -W -I$(GLEWDIR) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $<
- 
- rply.o: $(RPLYDIR)/rply.c
--	gcc -c -O2 -W -I$(RPLYDIR) -o $@ $<
--
--pnglite.o: $(PNGLITEDIR)/pnglite.c
--	gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $<
--
--$(TINYXMLDIR)/libtinyxml.a:
--	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $<

diff --git a/media-libs/openctm/files/openctm-no-strip.patch b/media-libs/openctm/files/openctm-no-strip.patch
deleted file mode 100644
index 5e31d4017b6..00000000000
--- a/media-libs/openctm/files/openctm-no-strip.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux
---- OpenCTM-1.0.3.old/lib/Makefile.linux	2014-08-20 09:39:00.614744990 +0200
-+++ OpenCTM-1.0.3/lib/Makefile.linux	2014-08-20 09:40:09.782667989 +0200
-@@ -72,7 +72,7 @@
- 	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)
- 
- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)
--	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
-+	$(CC) $(LDFLAGS) -shared  -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
- 	ln -s $(DYNAMICLIB) $(SONAME)
- 	ln -s $(DYNAMICLIB) $(LIBNAME)
- 
-diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux
---- OpenCTM-1.0.3.old/tools/Makefile.linux	2014-08-20 09:39:00.583745025 +0200
-+++ OpenCTM-1.0.3/tools/Makefile.linux	2014-08-20 09:40:09.751668023 +0200
-@@ -52,15 +52,15 @@
- 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
- 
- ctmconv: $(CTMCONVOBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
- 
- ctmviewer: $(CTMVIEWEROBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
- 	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
- 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
- 
- ctmbench: $(CTMBENCHOBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
- 
- %.o: %.cpp
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<

diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild
deleted file mode 100644
index c257f62436f..00000000000
--- a/media-libs/openctm/openctm-1.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator flag-o-matic toolchain-funcs
-
-MY_PV=OpenCTM-${PV}
-
-DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
-HOMEPAGE="http://openctm.sourceforge.net"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}+dfsg1.orig.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/tinyxml
-	media-libs/freeglut
-	media-libs/glew
-	media-libs/pnglite
-	virtual/opengl
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/openctm-fix-makefiles.patch \
-		"${FILESDIR}"/openctm-no-strip.patch
-	mv Makefile.linux Makefile || die
-	sed \
-		-e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}