Update OpenCSG to 1.4.2 (Switch from Qt4 to Qt5)

OK cwen@
This commit is contained in:
rsadowski 2020-02-04 06:09:04 +00:00
parent d0a83e8cbe
commit 769e17313f
3 changed files with 23 additions and 28 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2019/07/12 20:47:04 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2020/02/04 06:09:04 rsadowski Exp $
COMMENT = constructive solid geometry rendering library
V = 1.3.2
V = 1.4.2
DISTNAME = OpenCSG-${V}
PKGNAME = opencsg-${V}
REVISION = 1
SHARED_LIBS = opencsg 0.0
SHARED_LIBS = opencsg 1.0
CATEGORIES = graphics
@ -16,18 +15,19 @@ HOMEPAGE = http://www.opencsg.org/
# GPLv2 with CGAL exception
PERMIT_PACKAGE = Yes
WANTLIB += GL GLEW lib/qt4/QtGui m ${COMPILER_LIBCXX} pthread
WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
WANTLIB += ${COMPILER_LIBCXX} GL GLEW m
COMPILER = base-clang ports-gcc base-gcc
MASTER_SITES = http://www.opencsg.org/
MODULES = devel/qmake \
x11/qt5
MODQT_DEPS = No
MODULES = devel/qmake x11/qt4
SEPARATE_BUILD = No
LIB_DEPENDS = graphics/glew
MASTER_SITES = http://www.opencsg.org/
WRKSRC = ${WRKDIST}/src
pre-configure:

View File

@ -1,2 +1,2 @@
SHA256 (OpenCSG-1.3.2.tar.gz) = x5DJKZj3ETyzXN6CX4HFUydVkIoKP0PDw8jfIyazuSU=
SIZE (OpenCSG-1.3.2.tar.gz) = 744712
SHA256 (OpenCSG-1.4.2.tar.gz) = 2VLsXTouRqMAGcIQlj/N3/ZoE+/JwpYDty+VU63/Svs=
SIZE (OpenCSG-1.4.2.tar.gz) = 933135

View File

@ -1,17 +1,12 @@
$OpenBSD: patch-src_src_pro,v 1.2 2013/03/08 01:34:19 brad Exp $
--- src/src.pro.orig Fri Jan 18 12:31:07 2013
+++ src/src.pro Fri Jan 18 12:31:55 2013
@@ -1,10 +1,11 @@
TEMPLATE = lib
TARGET = opencsg
-VERSION = 1.3.2
+VERSION = ${LIBopencsg_VERSION}
DESTDIR = ../lib
$OpenBSD: patch-src_src_pro,v 1.3 2020/02/04 06:09:04 rsadowski Exp $
Index: src/src.pro
--- src/src.pro.orig
+++ src/src.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
TARGET = opencsg
-VERSION = 1.4.2
+VERSION = ${LIBopencsg_VERSION}
CONFIG += opengl warn_on release
-INCLUDEPATH += ../include ../glew/include ../
+INCLUDEPATH += ../include ../
+LIBS += -lGLEW
HEADERS = ../include/opencsg.h \
opencsgConfig.h \
isEmpty(INSTALLDIR) {
INSTALLDIR = /usr/local