cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to waffle 1.6.3

This commit is contained in:
jsg 2021-02-25 04:38:01 +00:00
parent cf05cbd5e8
commit 58f04d9fd0
11 changed files with 92 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/waffle/Makefile
View File

@ -1,24 +1,24 @@
# $OpenBSD: Makefile,v 1.3 2021/02/19 17:16:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2021/02/25 04:38:01 jsg Exp $
COMMENT= OpenGL API/window system abstraction
DISTNAME= waffle-1.5.2
DISTNAME= waffle-1.6.3
CATEGORIES= x11 graphics
HOMEPAGE= http://www.waffle-gl.org/
MASTER_SITES= ${HOMEPAGE}/files/release/${DISTNAME}/
HOMEPAGE= https://mesa.pages.freedesktop.org/waffle/
MASTER_SITES= ${HOMEPAGE}files/release/${DISTNAME}/
EXTRACT_SUFX= .tar.xz
REVISION= 0
MAINTAINER= Jonathan Gray <jsg@openbsd.org>
# 2-clause BSD
PERMIT_PACKAGE= Yes
SHARED_LIBS+= waffle-1 0.0 # 0.5
SHARED_LIBS+= waffle-1 1.0 # 1.6
WANTLIB= X11 X11-xcb c pthread xcb
MODULES= devel/cmake
MODULES= devel/meson
CONFIGURE_ARGS= -Dwaffle_has_gbm=1 \
-Dwaffle_has_glx=1 \
-Dwaffle_has_x11_egl=1
CONFIGURE_ARGS= -Dgbm=enabled \
-Dglx=enabled \
-Dx11_egl=enabled \
-Dwayland=disabled
.include <bsd.port.mk>

4
graphics/waffle/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (waffle-1.5.2.tar.xz) = 0sCWz2VL8AYTI6S5Ixoe9bdJoeXHxb/gZ+lkIZwqhRw=
SIZE (waffle-1.5.2.tar.xz) = 179284
SHA256 (waffle-1.6.3.tar.xz) = MOR7t4YW5d6rG5T9kBximkK27Dv2k8ZoIX1NX9m2Ihk=
SIZE (waffle-1.6.3.tar.xz) = 227524

9
graphics/waffle/patches/patch-cmake_Modules_WaffleValidateOptions_cmake
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-cmake_Modules_WaffleValidateOptions_cmake,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
--- cmake/Modules/WaffleValidateOptions.cmake.orig Sun Dec 20 16:26:53 2015
+++ cmake/Modules/WaffleValidateOptions.cmake Sun Dec 20 16:27:07 2015
@@ -58,11 +58,6 @@ if(waffle_on_linux)
$OpenBSD: patch-cmake_Modules_WaffleValidateOptions_cmake,v 1.2 2021/02/25 04:38:01 jsg Exp $
Index: cmake/Modules/WaffleValidateOptions.cmake
--- cmake/Modules/WaffleValidateOptions.cmake.orig
+++ cmake/Modules/WaffleValidateOptions.cmake
@@ -87,11 +87,6 @@ if(waffle_on_linux)
"${gbm_missing_deps} gbm"
)
endif()

19
graphics/waffle/patches/patch-meson_build Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-meson_build,v 1.1 2021/02/25 04:38:01 jsg Exp $
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -98,12 +98,11 @@ else
dep_x11_xcb = dependency('x11-xcb', required : get_option('x11_egl'))
endif
dep_gbm = dependency('gbm', required : get_option('gbm'))
- dep_udev = dependency('libudev', required : get_option('gbm'))
build_x11_egl = dep_egl.found()
build_wayland = dep_wayland_client.found() and dep_wayland_egl.found()
build_glx = dep_gl.found()
- build_gbm = dep_gbm.found() and dep_udev.found()
+ build_gbm = dep_gbm.found()
build_surfaceless = dep_egl.found()
endif

9
graphics/waffle/patches/patch-src_waffle_CMakeLists_txt
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_waffle_CMakeLists_txt,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
--- src/waffle/CMakeLists.txt.orig Wed Aug 26 07:05:10 2015
+++ src/waffle/CMakeLists.txt Sat Dec 26 13:41:14 2015
@@ -120,7 +120,7 @@ if(waffle_on_linux)
$OpenBSD: patch-src_waffle_CMakeLists_txt,v 1.2 2021/02/25 04:38:01 jsg Exp $
Index: src/waffle/CMakeLists.txt
--- src/waffle/CMakeLists.txt.orig
+++ src/waffle/CMakeLists.txt
@@ -123,7 +123,7 @@ if(waffle_on_linux)
linux/linux_platform.c
)
list(APPEND waffle_libdeps

9
graphics/waffle/patches/patch-src_waffle_egl_wegl_platform_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_waffle_egl_wegl_platform_c,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
--- src/waffle/egl/wegl_platform.c.orig Sun Dec 20 16:16:17 2015
+++ src/waffle/egl/wegl_platform.c Sun Dec 20 16:16:51 2015
@@ -29,7 +29,7 @@
$OpenBSD: patch-src_waffle_egl_wegl_platform_c,v 1.2 2021/02/25 04:38:01 jsg Exp $
Index: src/waffle/egl/wegl_platform.c
--- src/waffle/egl/wegl_platform.c.orig
+++ src/waffle/egl/wegl_platform.c
@@ -31,7 +31,7 @@
#include "wegl_platform.h"

32
graphics/waffle/patches/patch-src_waffle_gbm_wgbm_display_c
View File

@ -1,40 +1,36 @@
$OpenBSD: patch-src_waffle_gbm_wgbm_display_c,v 1.2 2021/02/19 17:16:27 ajacoutot Exp $
--- src/waffle/gbm/wgbm_display.c.orig Wed Aug 26 07:05:10 2015
+++ src/waffle/gbm/wgbm_display.c Mon Dec 21 16:57:09 2015
@@ -29,11 +29,13 @@
$OpenBSD: patch-src_waffle_gbm_wgbm_display_c,v 1.3 2021/02/25 04:38:01 jsg Exp $
Index: src/waffle/gbm/wgbm_display.c
--- src/waffle/gbm/wgbm_display.c.orig
+++ src/waffle/gbm/wgbm_display.c
@@ -29,7 +29,9 @@
#include <stdlib.h>
#include <unistd.h>
-#include <libudev.h>
+#ifdef __linux__
#include <libudev.h>
+#endif
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef __linux__
+#include <libudev.h>
#include <linux/input.h>
+#endif
#include "wcore_error.h"
@@ -68,6 +70,9 @@ wgbm_display_destroy(struct wcore_display *wc_self)
static int
@@ -67,6 +69,9 @@ wgbm_display_destroy(struct wcore_display *wc_self)
int
wgbm_get_default_fd_for_pattern(const char *pattern)
{
+#ifdef __OpenBSD__
+#ifndef __linux__
+ return open("/dev/dri/card0", O_RDWR, 0);
+#else
struct udev *ud;
struct udev_enumerate *en;
struct udev_list_entry *devices, *entry;
@@ -97,6 +102,7 @@ wgbm_get_default_fd_for_pattern(const char *pattern)
udev_enumerate_unref(en);
udev_unref(ud);
+#endif
return -1;
+#endif
}
@@ -147,7 +153,7 @@ wgbm_display_connect(struct wcore_platform *wc_plat,
static int
@@ -146,7 +152,7 @@ wgbm_display_connect(struct wcore_platform *wc_plat,
}
}

9
graphics/waffle/patches/patch-src_waffle_gbm_wgbm_platform_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_waffle_gbm_wgbm_platform_c,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
--- src/waffle/gbm/wgbm_platform.c.orig Sun Dec 20 16:33:32 2015
+++ src/waffle/gbm/wgbm_platform.c Sun Dec 20 16:33:46 2015
@@ -42,7 +42,7 @@
$OpenBSD: patch-src_waffle_gbm_wgbm_platform_c,v 1.2 2021/02/25 04:38:01 jsg Exp $
Index: src/waffle/gbm/wgbm_platform.c
--- src/waffle/gbm/wgbm_platform.c.orig
+++ src/waffle/gbm/wgbm_platform.c
@@ -40,7 +40,7 @@
#include "wgbm_platform.h"
#include "wgbm_window.h"

21
graphics/waffle/patches/patch-src_waffle_linux_linux_dl_c
View File

@ -1,22 +1,23 @@
$OpenBSD: patch-src_waffle_linux_linux_dl_c,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
--- src/waffle/linux/linux_dl.c.orig Sun Dec 20 16:18:31 2015
+++ src/waffle/linux/linux_dl.c Sun Dec 20 16:19:46 2015
@@ -48,9 +48,13 @@ linux_dl_get_name(int32_t waffle_dl)
{
switch (waffle_dl) {
$OpenBSD: patch-src_waffle_linux_linux_dl_c,v 1.2 2021/02/25 04:38:01 jsg Exp $
Index: src/waffle/linux/linux_dl.c
--- src/waffle/linux/linux_dl.c.orig
+++ src/waffle/linux/linux_dl.c
@@ -51,11 +51,13 @@ linux_dl_get_name(int32_t waffle_dl)
case WAFFLE_DL_OPENGL:
+#ifdef __OpenBSD__
#ifdef WAFFLE_HAS_ANDROID
return NULL;
+#elif defined(__OpenBSD__)
+ return "libGL.so";
+#else
#else
return "libGL.so.1";
+#endif
#endif
case WAFFLE_DL_OPENGL_ES1:
-#ifdef WAFFLE_HAS_ANDROID
+#if defined(WAFFLE_HAS_ANDROID) || defined(__OpenBSD__)
return "libGLESv1_CM.so";
#else
return "libGLESv1_CM.so.1";
@@ -63,7 +67,7 @@ linux_dl_get_name(int32_t waffle_dl)
@@ -68,7 +70,7 @@ linux_dl_get_name(int32_t waffle_dl)
// Mesa did not change the library's soname when it added the ES3
// symbols. The soname was and is libGLESv2.so.2 before and after
// ES3.

13
graphics/waffle/patches/patch-third_party_cmocka_include_cmocka_h
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-third_party_cmocka_include_cmocka_h,v 1.1 2015/12/28 17:20:18 jca Exp $
$OpenBSD: patch-third_party_cmocka_include_cmocka_h,v 1.2 2021/02/25 04:38:01 jsg Exp $
Avoid a conflicting typedef on 32-bit arch.
--- third_party/cmocka/include/cmocka.h.orig Tue Aug 25 23:05:10 2015
+++ third_party/cmocka/include/cmocka.h Mon Dec 28 18:15:45 2015
@@ -81,6 +81,9 @@ int __stdcall IsDebuggerPresent();
Index: third_party/cmocka/include/cmocka.h
--- third_party/cmocka/include/cmocka.h.orig
+++ third_party/cmocka/include/cmocka.h
@@ -96,6 +96,9 @@ typedef uintmax_t LargestIntegralType;
#define cast_to_largest_integral_type(value) \
((LargestIntegralType)((size_t)(value)))
((LargestIntegralType)(value))
+#if defined(__OpenBSD__)
+#include <stdint.h>
@ -14,7 +15,7 @@ Avoid a conflicting typedef on 32-bit arch.
/* Smallest integral type capable of holding a pointer. */
#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
# if defined(_WIN32)
@@ -109,6 +112,7 @@ int __stdcall IsDebuggerPresent();
@@ -124,6 +127,7 @@ typedef uintmax_t LargestIntegralType;
# define _UINTPTR_T
# define _UINTPTR_T_DEFINED
#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */

18
graphics/waffle/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/12/26 03:00:13 jsg Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/02/25 04:38:01 jsg Exp $
@bin bin/wflinfo
include/waffle-1/
include/waffle-1/waffle.h
@ -7,20 +7,16 @@ include/waffle-1/waffle_glx.h
include/waffle-1/waffle_version.h
include/waffle-1/waffle_wayland.h
include/waffle-1/waffle_x11_egl.h
lib/cmake/
lib/cmake/Waffle/
lib/cmake/Waffle/WaffleConfig.cmake
lib/cmake/Waffle/WaffleConfigVersion.cmake
@lib lib/libwaffle-1.so.${LIBwaffle-1_VERSION}
lib/pkgconfig/waffle-1.pc
share/cmake/
share/cmake/Modules/
share/cmake/Modules/FindWaffle.cmake
share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/wflinfo
share/doc/waffle1/
share/doc/waffle1/HACKING.txt
share/doc/waffle1/LICENSE-threads.txt
share/doc/waffle1/LICENSE.txt
share/doc/waffle1/README.txt
share/doc/waffle1/README.md
share/doc/waffle1/examples/
share/doc/waffle1/examples/Makefile.example
share/doc/waffle1/examples/gl_basic.c
@ -47,3 +43,7 @@ share/doc/waffle1/release-notes/waffle-1.4.4.txt
share/doc/waffle1/release-notes/waffle-1.5.0.txt
share/doc/waffle1/release-notes/waffle-1.5.1.txt
share/doc/waffle1/release-notes/waffle-1.5.2.txt
share/doc/waffle1/release-notes/waffle-1.6.0.md
share/doc/waffle1/release-notes/waffle-1.6.1.md
share/doc/waffle1/release-notes/waffle-1.6.2.md
share/doc/waffle1/release-notes/waffle-1.6.3.md