Regen WANTLIB now that gtkglext does not require pangox-compat and make sure
everything builds fine with pango >=1.44 (except for games/ufoai/base for now)
This commit is contained in:
ajacoutot
parent
bb4d4b8172
commit
5aa34c940b
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.49 2019/07/12 20:43:30 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.50 2019/12/29 23:56:58 ajacoutot Exp $
|
||||
|
||||
COMMENT= free space simulator and planetarium
|
||||
|
||||
DISTNAME= celestia-1.6.1
|
||||
REVISION= 18
|
||||
REVISION= 19
|
||||
|
||||
CATEGORIES= astro x11
|
||||
|
||||
@ -16,18 +16,18 @@ PERMIT_PACKAGE= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/}
|
||||
|
||||
WANTLIB += GL GLU ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
|
||||
WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm
|
||||
WANTLIB += atk-1.0 c cairo drm expat ffi fontconfig freetype gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 gdkglext-x11-1.0 gio-2.0 glapi glib-2.0
|
||||
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
|
||||
WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 X11-xcb Xcomposite Xcursor
|
||||
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
|
||||
WANTLIB += atk-1.0 c cairo drm expat ffi fontconfig freetype fribidi
|
||||
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0 gio-2.0
|
||||
WANTLIB += glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gtk-x11-2.0
|
||||
WANTLIB += gtkglext-x11-1.0 harfbuzz iconv intl jpeg m ogg pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pangox-1.0 pcre pixman-1
|
||||
WANTLIB += png pthread ${COMPILER_LIBCXX} theora xcb xcb-dri2
|
||||
WANTLIB += xcb-glx xcb-render xcb-shm z
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png theora
|
||||
WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render
|
||||
WANTLIB += xcb-shm xcb-sync xcb-xfixes xshmfence z
|
||||
WANTLIB += ${MODLUA_WANTLIB}
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
COMPILER= base-clang ports-gcc base-gcc
|
||||
|
||||
MODULES= lang/lua
|
||||
BUILD_DEPENDS= devel/gettext,-tools
|
||||
@ -44,6 +44,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lGL" \
|
||||
LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
|
||||
LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
|
||||
|
||||
CONFIGURE_ARGS= --with-gtk \
|
||||
--with-lua \
|
||||
--enable-cairo \
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.41 2019/07/12 20:43:45 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.42 2019/12/29 23:56:58 ajacoutot Exp $
|
||||
|
||||
COMMENT= printed circuit board layout tool
|
||||
DISTNAME= pcb-4.1.3
|
||||
CATEGORIES= cad
|
||||
REVISION= 0
|
||||
EPOCH= 0
|
||||
|
||||
HOMEPAGE= http://pcb.geda-project.org/
|
||||
@ -10,12 +11,12 @@ HOMEPAGE= http://pcb.geda-project.org/
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB = GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
|
||||
WANTLIB += Xinerama Xmu Xrandr Xrender Xt atk-1.0 c cairo dbus-1
|
||||
WANTLIB += fontconfig freetype gd gdk-x11-2.0 gdk_pixbuf-2.0
|
||||
WANTLIB += gdkglext-x11-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
|
||||
WANTLIB += gtk-x11-2.0 gtkglext-x11-1.0 iconv intl m pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pangox-1.0 pthread z
|
||||
WANTLIB += GL GLU X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
|
||||
WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 fontconfig
|
||||
WANTLIB += freetype gd gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 gtkglext-x11-1.0
|
||||
WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += z
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcb/}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
$OpenBSD: patch-src-make_local,v 1.6 2011/09/28 16:45:17 jasper Exp $
|
||||
--- src/make_local.orig Sun Jun 19 22:16:55 2011
|
||||
+++ src/make_local Wed Sep 28 17:35:29 2011
|
||||
$OpenBSD: patch-src-make_local,v 1.7 2019/12/29 23:56:58 ajacoutot Exp $
|
||||
Index: src/make_local
|
||||
--- src/make_local.orig
|
||||
+++ src/make_local
|
||||
@@ -70,29 +70,29 @@ PATH_GTKGL_L =-L/usr/lib
|
||||
|
||||
#================================= OpenBSD =====================================
|
||||
@ -36,7 +37,7 @@ $OpenBSD: patch-src-make_local,v 1.6 2011/09/28 16:45:17 jasper Exp $
|
||||
+PATH_PANGO_H = -I${LOCALBASE}/include/pango-1.0
|
||||
+PATH_ATK_H = -I${LOCALBASE}/include/atk-1.0
|
||||
+PATH_GTK_H = -I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/lib/gtk-2.0/include \
|
||||
+ -I/usr/include/gdk-pixbuf-2.0/
|
||||
+ -I${LOCALBASE}/include/gdk-pixbuf-2.0/ -I${LOCALBASE}/include/harfbuzz
|
||||
+PATH_MESA_H = -I${X11BASE}/include/GL
|
||||
+PATH_GTKGL_H = -I${LOCALBASE}/include/gtkglext-1.0 \
|
||||
+ -I${LOCALBASE}/lib/gtkglext-1.0/include/
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.14 2019/07/12 20:46:10 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.15 2019/12/29 23:56:59 ajacoutot Exp $
|
||||
|
||||
COMMENT = Dragon and CoCo emulator
|
||||
|
||||
DISTNAME = xroar-0.35.4
|
||||
REVISION = 0
|
||||
|
||||
CATEGORIES = emulators
|
||||
|
||||
@ -13,11 +14,12 @@ MAINTAINER = Juan Francisco Cantero Hurtado <juanfra@openbsd.org>
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += GL GLU ICE SDL2 SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
|
||||
WANTLIB += Xinerama Xmu Xt Xrandr Xrender atk-1.0 c cairo fontconfig freetype
|
||||
WANTLIB += gdk-x11-2.0 gdkglext-x11-1.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 gtkglext-x11-1.0 intl m
|
||||
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0 pthread sndfile z
|
||||
WANTLIB += GL SDL2 X11 Xcomposite Xcursor Xdamage Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
|
||||
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 gtkglext-x11-1.0
|
||||
WANTLIB += harfbuzz intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pthread sndfile z
|
||||
|
||||
MASTER_SITES = https://www.6809.org.uk/xroar/dl/
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2019/07/12 20:46:18 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2019/12/29 23:56:59 ajacoutot Exp $
|
||||
|
||||
COMMENT = GNU Backgammon
|
||||
V = 1.05.002
|
||||
@ -6,22 +6,23 @@ DISTNAME = gnubg-release-$V-sources
|
||||
PKGNAME = gnubg-$V
|
||||
CATEGORIES = games x11
|
||||
HOMEPAGE = http://gnubg.org/
|
||||
REVISION = 6
|
||||
REVISION = 7
|
||||
|
||||
# GPLv3+
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += GL GLU X11 X11-xcb Xcomposite Xcursor Xdamage Xext
|
||||
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c
|
||||
WANTLIB += cairo canberra canberra-gtk crypto curl curses drm
|
||||
WANTLIB += expat ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
|
||||
WANTLIB += gdkglext-x11-1.0 gio-2.0 glapi glib-2.0 gmodule-2.0
|
||||
WANTLIB += gmp gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 gtkglext-x11-1.0
|
||||
WANTLIB += harfbuzz iconv intl ltdl m nghttp2 ogg pango-1.0 pangocairo-1.0
|
||||
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread readline sqlite3
|
||||
WANTLIB += ssl util vorbis vorbisfile xcb xcb-dri2 xcb-dri3 xcb-glx
|
||||
WANTLIB += xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
|
||||
WANTLIB += xshmfence z
|
||||
WANTLIB += ${MODPY_WANTLIB}
|
||||
WANTLIB += GL GLU ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
|
||||
WANTLIB += Xfixes Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm atk-1.0 c
|
||||
WANTLIB += cairo canberra canberra-gtk crypto curl drm expat ffi
|
||||
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
|
||||
WANTLIB += gdkglext-x11-1.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gmp
|
||||
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
|
||||
WANTLIB += gtkglext-x11-1.0 harfbuzz iconv intl ltdl m ncurses nghttp2
|
||||
WANTLIB += ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0 pcre
|
||||
WANTLIB += pixman-1 png pthread readline sqlite3 ssl util
|
||||
WANTLIB += vorbis vorbisfile xcb xcb-dri2 xcb-glx xcb-render xcb-shm z
|
||||
|
||||
MASTER_SITES = http://gnubg.org/media/sources/
|
||||
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2019/05/20 22:15:11 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2019/12/29 23:56:59 ajacoutot Exp $
|
||||
|
||||
BROKEN = does not build with pango >=1.44
|
||||
|
||||
COMMENT-main = squad-based tactical strategy game
|
||||
COMMENT-editor = UFO:AI map editor
|
||||
@ -6,7 +8,7 @@ COMMENT-editor = UFO:AI map editor
|
||||
DISTNAME = ufoai-${V}-source
|
||||
PKGNAME-main = ${DISTNAME:S/-source//}
|
||||
PKGNAME-editor = uforadiant-${V}
|
||||
REVISION-editor = 4
|
||||
REVISION-editor = 5
|
||||
REVISION-main = 4
|
||||
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
@ -27,7 +29,7 @@ WANTLIB-editor += gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
|
||||
WANTLIB-editor += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB-editor += gtk-x11-2.0 gtkglext-x11-1.0 gtksourceview-2.0
|
||||
WANTLIB-editor += openal pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB-editor += pangox-1.0 vorbisfile xml2 ${cWANTLIB}
|
||||
WANTLIB-editor += vorbisfile xml2 ${cWANTLIB}
|
||||
|
||||
COMPILER = base-clang ports-gcc
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user