[gentoo-commits] gentoo-x86 commit in media-libs/openctm/files: openctm-fix-makefiles.patch
jlec14/10/20 08:02:33 Modified: openctm-fix-makefiles.patch Log: media-libs/openctm: Fix for multilib-strict (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) Revision ChangesPath 1.3 media-libs/openctm/files/openctm-fix-makefiles.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?r1=1.2r2=1.3 Index: openctm-fix-makefiles.patch === RCS file: /var/cvsroot/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openctm-fix-makefiles.patch 10 Aug 2014 12:28:12 - 1.2 +++ openctm-fix-makefiles.patch 20 Oct 2014 08:02:33 - 1.3 @@ -1,12 +1,46 @@ -diff -urN OpenCTM-1.0.3.old/doc/Makefile.linux OpenCTM-1.0.3/doc/Makefile.linux OpenCTM-1.0.3.old/doc/Makefile.linux 1970-01-01 01:00:00.0 +0100 -+++ OpenCTM-1.0.3/doc/Makefile.linux 2014-08-10 13:56:45.821979758 +0200 -@@ -0,0 +1,2 @@ -+%: -+ true -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-10 13:55:34.090983462 +0200 -+++ OpenCTM-1.0.3/lib/Makefile.linux 2014-08-10 13:59:03.312971874 +0200 + 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 @@ ### @@ -30,7 +64,7 @@ OBJS = openctm.o \ stream.o \ -@@ -64,16 +69,18 @@ +@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \ all: $(DYNAMICLIB) clean: @@ -53,42 +87,10 @@ depend: $(DEPEND) $(SRCS) $(LZMA_SRCS) make.depend -diff -urN OpenCTM-1.0.3.old/Makefile.linux OpenCTM-1.0.3/Makefile.linux OpenCTM-1.0.3.old/Makefile.linux 2014-08-10 13:55:34.096983462 +0200 -+++ OpenCTM-1.0.3/Makefile.linux 2014-08-10 13:56:45.821979758 +0200 -@@ -47,19 +47,21 @@ - - - # Installation settings --LIBDIR = /usr/lib/ --INCDIR = /usr/local/include/ --BINDIR = /usr/local/bin/ --MAN1DIR = /usr/local/share/man/man1/ --CP = cp -+LIBDIR = $(DESTDIR)/usr/lib/$(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 -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-10 13:55:34.094983462 +0200 -+++ OpenCTM-1.0.3/tools/Makefile.linux 2014-08-10 14:00:52.484964897 +0200 +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 @@ ### @@
[gentoo-commits] gentoo-x86 commit in media-libs/openctm/files: openctm-fix-makefiles.patch
amynka 14/08/10 12:28:12 Modified: openctm-fix-makefiles.patch Log: Obey settings of CC and CXX. Update patch from debian to reflect this. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 34E69781) Revision ChangesPath 1.2 media-libs/openctm/files/openctm-fix-makefiles.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?rev=1.2view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?rev=1.2content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?r1=1.1r2=1.2 Index: openctm-fix-makefiles.patch === RCS file: /var/cvsroot/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openctm-fix-makefiles.patch 7 Aug 2014 16:50:58 - 1.1 +++ openctm-fix-makefiles.patch 10 Aug 2014 12:28:12 - 1.2 @@ -1,46 +1,20 @@ -Description: Debian changes to Makefiles -Author: Teemu Ikonen tpiko...@gmail.com - openctm-1.0.3.orig/Makefile.linux -+++ openctm-1.0.3/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/lib/$(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) openctm-1.0.3.orig/lib/Makefile.linux -+++ openctm-1.0.3/lib/Makefile.linux -@@ -28,12 +28,17 @@ +diff -urN OpenCTM-1.0.3.old/doc/Makefile.linux OpenCTM-1.0.3/doc/Makefile.linux +--- OpenCTM-1.0.3.old/doc/Makefile.linux 1970-01-01 01:00:00.0 +0100 OpenCTM-1.0.3/doc/Makefile.linux 2014-08-10 13:56:45.821979758 +0200 +@@ -0,0 +1,2 @@ ++%: ++ true +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-10 13:55:34.090983462 +0200 OpenCTM-1.0.3/lib/Makefile.linux 2014-08-10 13:59:03.312971874 +0200 +@@ -27,13 +27,18 @@ + ### LZMADIR = liblzma - CC = gcc +-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 @@ -56,7 +30,7 @@ OBJS = openctm.o \ stream.o \ -@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \ +@@ -64,16 +69,18 @@ all: $(DYNAMICLIB) clean: @@ -65,7 +39,7 @@ $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS) - gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm -+ gcc $(LDFLAGS) -shared -s -Wl,-soname,$(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) @@ -79,14 +53,43 @@ depend: $(DEPEND) $(SRCS) $(LZMA_SRCS) make.depend /dev/null -+++ openctm-1.0.3/doc/Makefile.linux -@@ -0,0 +1,2 @@ -+%: -+ true openctm-1.0.3.orig/tools/Makefile.linux -+++ openctm-1.0.3/tools/Makefile.linux -@@ -26,49 +26,55 @@ +diff -urN OpenCTM-1.0.3.old/Makefile.linux OpenCTM-1.0.3/Makefile.linux +--- OpenCTM-1.0.3.old/Makefile.linux 2014-08-10 13:55:34.096983462 +0200 OpenCTM-1.0.3/Makefile.linux 2014-08-10 13:56:45.821979758 +0200 +@@ -47,19 +47,21 @@ + + + # Installation settings +-LIBDIR = /usr/lib/ +-INCDIR = /usr/local/include/ +-BINDIR = /usr/local/bin/ +-MAN1DIR = /usr/local/share/man/man1/ +-CP = cp ++LIBDIR = $(DESTDIR)/usr/lib/$(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) +
[gentoo-commits] gentoo-x86 commit in media-libs/openctm/files: openctm-fix-makefiles.patch
amynka 14/08/07 16:50:58 Added:openctm-fix-makefiles.patch Log: Initial commit. Package will be used by meshlab (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 34E69781) Revision ChangesPath 1.1 media-libs/openctm/files/openctm-fix-makefiles.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?rev=1.1view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openctm/files/openctm-fix-makefiles.patch?rev=1.1content-type=text/plain Index: openctm-fix-makefiles.patch === Description: Debian changes to Makefiles Author: Teemu Ikonen tpiko...@gmail.com --- openctm-1.0.3.orig/Makefile.linux +++ openctm-1.0.3/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/lib/$(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) --- openctm-1.0.3.orig/lib/Makefile.linux +++ openctm-1.0.3/lib/Makefile.linux @@ -28,12 +28,17 @@ 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 +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 + gcc $(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 --- /dev/null +++ openctm-1.0.3/doc/Makefile.linux @@ -0,0 +1,2 @@ +%: + true --- openctm-1.0.3.orig/tools/Makefile.linux +++ openctm-1.0.3/tools/Makefile.linux @@ -26,49 +26,55 @@ ### 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++ +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 +# cd $(JPEGDIR) $(MAKE) -f makefile.linux clean +# cd $(TINYXMLDIR) $(MAKE) -f Makefile.linux clean +# cd $(ZLIBDIR) $(MAKE) -f Makefile.linux clean + +#libopenctm.so:
