Date: Saturday, April 25, 2020 @ 10:54:57 Author: foutrelis Revision: 620634
archrelease: copy trunk to multilib-x86_64 Added: lib32-glew/repos/multilib-x86_64/PKGBUILD (from rev 620633, lib32-glew/trunk/PKGBUILD) lib32-glew/repos/multilib-x86_64/glew-install.patch (from rev 620633, lib32-glew/trunk/glew-install.patch) Deleted: lib32-glew/repos/multilib-x86_64/PKGBUILD --------------------+ PKGBUILD | 82 +++++++++++++++++++++++++++------------------------ glew-install.patch | 73 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 37 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-25 10:54:52 UTC (rev 620633) +++ PKGBUILD 2020-04-25 10:54:57 UTC (rev 620634) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <f...@xinu.at> - -_pkgbasename=glew -pkgname=lib32-$_pkgbasename -pkgver=2.1.0 -pkgrel=1 -pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" -arch=('x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('lib32-libxmu' 'lib32-libxi' 'lib32-glu' "$_pkgbasename>=$pkgver") -makedepends=('gcc-multilib') -source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz) -sha1sums=('18eca05460d0b61709fc115e632b6fe320718b44') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux - sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux - sed -i 's|lib64|lib32|g' config/Makefile.linux - - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" \ - PKGDIR="/usr/lib32/pkgconfig" install - - rm -rf "${pkgdir}"/usr/{include,bin} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} Copied: lib32-glew/repos/multilib-x86_64/PKGBUILD (from rev 620633, lib32-glew/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-25 10:54:57 UTC (rev 620634) @@ -0,0 +1,45 @@ +# Maintainer: Florian Pritz <f...@xinu.at> + +_pkgbasename=glew +pkgname=lib32-$_pkgbasename +pkgver=2.2.0 +pkgrel=1 +pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" +arch=('x86_64') +url="https://github.com/nigels-com/glew" +license=('BSD' 'MIT' 'GPL') +depends=('lib32-libxmu' 'lib32-libxi' 'lib32-glu' "$_pkgbasename>=$pkgver") +makedepends=('gcc-multilib') +provides=('libGLEW.so') +source=(https://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz + glew-install.patch) +sha1sums=('22d6e9b9e691080eb6313407dbf51cfebc3345ea' + 'e1bfa1e6ae3c7a553920978111092ea9d3a33c95') + +prepare() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + patch -Np1 -i ../glew-install.patch +} + + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux + sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux + sed -i 's|lib64|lib32|g' config/Makefile.linux + + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" \ + PKGDIR="/usr/lib32/pkgconfig" install + + rm -rf "${pkgdir}"/usr/{include,bin} + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} Copied: lib32-glew/repos/multilib-x86_64/glew-install.patch (from rev 620633, lib32-glew/trunk/glew-install.patch) =================================================================== --- glew-install.patch (rev 0) +++ glew-install.patch 2020-04-25 10:54:57 UTC (rev 620634) @@ -0,0 +1,73 @@ +--- glew-2.2.0/Makefile 2020-03-15 12:53:59.000000000 +0100 ++++ glew-2.2.0/Makefile 2020-04-17 11:51:25.568482195 +0200 +@@ -120,7 +120,7 @@ + endif + + $(LIB.SHARED.DIR)/$(LIB.SHARED): $(LIB.SOBJS) +- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) ++ $(LD) $(LDFLAGS.SO) $(LDFLAGS) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) + ifneq ($(LN),) + $(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.SONAME) + $(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.DEVLNK) +@@ -131,11 +131,11 @@ + + tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +- $(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< ++ $(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $< + + tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +- $(CC) -DGLEW_NO_GLU -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< ++ $(CC) -DGLEW_NO_GLU -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $< + + # Force re-write of glew.pc, GLEW_DEST can vary + +@@ -180,13 +180,13 @@ + mkdir bin + + bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif + + bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif +@@ -193,11 +193,11 @@ + + $(GLEWINFO.BIN.OBJ): $(GLEWINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< ++ $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $< + + $(VISUALINFO.BIN.OBJ): $(VISUALINFO.BIN.SRC) include/GL/glew.h include/GL/wglew.h include/GL/glxew.h + @mkdir -p $(dir $@) +- $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< ++ $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) $(LDFLAGS) -o $@ -c $< + + # Install targets + +--- glew-2.1.0/Makefile.install 2018-08-15 13:51:45.220637107 +0200 ++++ glew-2.1.0/Makefile 2018-08-15 13:52:02.168740876 +0200 +@@ -231,6 +231,7 @@ install.bin: glew.bin + + install.include: + $(INSTALL) -d -m 0755 "$(DESTDIR)$(INCDIR)" ++ $(INSTALL) -m 0644 include/GL/eglew.h "$(DESTDIR)$(INCDIR)/" + $(INSTALL) -m 0644 include/GL/wglew.h "$(DESTDIR)$(INCDIR)/" + $(INSTALL) -m 0644 include/GL/glew.h "$(DESTDIR)$(INCDIR)/" + $(INSTALL) -m 0644 include/GL/glxew.h "$(DESTDIR)$(INCDIR)/" +@@ -241,6 +242,7 @@ install.pkgconfig: glew.pc + $(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(PKGDIR)/" + + uninstall: ++ $(RM) "$(DESTDIR)$(INCDIR)/eglew.h" + $(RM) "$(DESTDIR)$(INCDIR)/wglew.h" + $(RM) "$(DESTDIR)$(INCDIR)/glew.h" + $(RM) "$(DESTDIR)$(INCDIR)/glxew.h"