From 85e0dac14f065f64bf0381680f1ca32dd46a292f Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Mon, 14 Oct 2019 23:23:58 -0500 Subject: [PATCH 1/2] libGL: add wayland build_option --- srcpkgs/libGL/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index 78f81d3ddcf..1cda435d07f 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -7,14 +7,15 @@ build_style=meson configure_args="-Dshared-glapi=true -Dgbm=true -Degl=true -Dgallium-vdpau=true -Dgallium-xvmc=true -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dgallium-va=true -Dlmsensors=true - -Dplatforms=x11,drm,wayland,surfaceless -Dllvm=true + -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless -Dllvm=true -Db_lto=false" hostmakedepends="flex libxml2-python llvm pkg-config - python3-Mako wayland-protocols wayland-devel" + python3-Mako $(vopt_if wayland 'wayland-protocols wayland-devel')" makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel talloc-devel zlib-devel - wayland-devel wayland-protocols llvm libsensors-devel libXrandr-devel" + $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel + libXrandr-devel" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Orphaned " license="MIT, LGPL-2.1-or-later" @@ -23,6 +24,9 @@ changelog="https://www.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9 +build_options="wayland" +build_options_default="wayland" + # Set subpackages manually to set proper rdeps in 32bit pkgs. subpackages="libglapi libgbm libEGL libGLES libOSMesa" From c3e045c1502591a204d93141b6199988d223f6e2 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 8 Oct 2019 12:57:45 -0500 Subject: [PATCH 2/2] wxPython4: actually build core library --- ...-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch | 12 ++++++------ srcpkgs/wxPython4/template | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch index 47606caa474..f741a968864 100644 --- a/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch +++ b/srcpkgs/wxPython4/patches/0001-Switch-to-wx-config-gtk3.0-to-avoid-conflict-with-wx.patch @@ -1,7 +1,7 @@ From cddbe3b3b237b8e63abd8921fdb20314c20c2c08 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Sat, 22 Sep 2018 20:59:29 -0700 -Subject: [PATCH] Switch to wx-config-gtk3.0 to avoid conflict with +Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with wxWidgets-gtk2 --- @@ -17,7 +17,7 @@ index 3cd5b828..57dbd384 100755 ("use_syswx", (False, "Try to use an installed wx rather than building the " - "one in this source tree. The wx-config in {prefix}/bin " -+ "one in this source tree. The wx-config-gtk3.0 in {prefix}/bin " ++ "one in this source tree. The wx-config-gtk3 in {prefix}/bin " "or the first found on the PATH determines which wx is " "used. Implies --no_magic.")), ("force_config", (False, "Run configure when building even if the script " @@ -26,7 +26,7 @@ index 3cd5b828..57dbd384 100755 os.path.join(wxDir(), 'setup.h.in'), os.path.join(wxDir(), 'version-script.in'), - os.path.join(wxDir(), 'wx-config.in'), -+ os.path.join(wxDir(), 'wx-config-gtk3.0.in'), ++ os.path.join(wxDir(), 'wx-config-gtk3.in'), ] for dep in dependencies: if newer(dep, os.path.join(BUILD_DIR, "Makefile")): @@ -35,15 +35,15 @@ index 3cd5b828..57dbd384 100755 if not isWindows: - WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config') -+ WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3.0') ++ WX_CONFIG = posixjoin(BUILD_DIR, 'wx-config-gtk3') if options.use_syswx: - wxcfg = posixjoin(options.prefix, 'bin', 'wx-config') -+ wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3.0') ++ wxcfg = posixjoin(options.prefix, 'bin', 'wx-config-gtk3') if options.prefix and os.path.exists(wxcfg): WX_CONFIG = wxcfg else: - WX_CONFIG = 'wx-config' # hope it is on the PATH -+ WX_CONFIG = 'wx-config-gtk3.0' # hope it is on the PATH ++ WX_CONFIG = 'wx-config-gtk3' # hope it is on the PATH wafBuildBase = wafBuildDir = getWafBuildBase() diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template index b38d04c067f..2aa7117d5e0 100644 --- a/srcpkgs/wxPython4/template +++ b/srcpkgs/wxPython4/template @@ -1,7 +1,7 @@ # Template file for 'wxPython4' pkgname=wxPython4 version=4.0.6 -revision=1 +revision=2 wrksrc="wxPython-${version}" build_style=python3-module pycompile_module="wx" @@ -19,7 +19,6 @@ distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz" checksum=35cc8ae9dd5246e2c9861bb796026bbcb9fb083e4d49650f776622171ecdab37 if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" python3" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}" fi @@ -33,9 +32,10 @@ pre_build() { LDSHARED="${CC} -shared $LDFLAGS" env CC="$CC" LDSHARED="$LDSHARED" \ PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - LDFLAGS="$LDFLAGS" python3 build.py --use_syswx + PYTHON_CONFIG="${XBPS_CROSS_BASE}/bin/python3-config" \ + LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx else - python3 build.py --use_syswx + python3 build.py build_py --use_syswx fi }