commit 32f98dee643c022ce8ebf7733db583571801b566 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Nov 3 12:04:35 2019 +1100 libsdl2-32: fix for the OpenGL headers and their data types diff --git a/libsdl2-32/.signature b/libsdl2-32/.signature index af9fce6..26ab30f 100644 --- a/libsdl2-32/.signature +++ b/libsdl2-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXf3tv8hWyvReljbkwDUiyBaCTa/1++Ql3R3A3AkdnPrc2koA9RnDy09IsJiUm/u4m2oyQiIs1Srtwk2+6uYePw4= -SHA256 (Pkgfile) = c16b0bc1b25c3476669252452f5ec2906aec86d821051c17e0b0a0b0b555746a +RWSwxGo/zH7eXUitnE5cwWhRj/WIopsnL6vvr4nbtNlQNyqqReE3CZFLgsBfHpHUOVYPSYMGldH4uRFlrz8dplnMn73oAfMF3Aw= +SHA256 (Pkgfile) = 7aeb55c97e732f4000b8615c392f707dfddc27691d6218c9db3699b4474840ee SHA256 (.footprint) = 672c78886f39e064a86b8bc657dce400a2c1bd665b8e03a2f1d603dabb581716 SHA256 (SDL2-2.0.10.tar.gz) = b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57 +SHA256 (SDL2-2.0.10-opengl_include_fix-1.patch) = 65d088c18457cc7edb2802ccc7ed32a2ee8b3c211f310e326aac3e8cdbe9f79b diff --git a/libsdl2-32/Pkgfile b/libsdl2-32/Pkgfile index 6256a74..6f1ae45 100644 --- a/libsdl2-32/Pkgfile +++ b/libsdl2-32/Pkgfile @@ -1,16 +1,20 @@ # Description: SDL version 2, Simple DirectMedia Layer -# URL: http://www.libsdl.org/ +# URL: https://www.libsdl.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: alsa-lib-32 libsdl2 mesa3d-32 name=libsdl2-32 version=2.0.10 -release=1 -source=(https://www.libsdl.org/release/SDL2-$version.tar.gz) +release=2 +source=(https://www.libsdl.org/release/SDL2-$version.tar.gz + SDL2-2.0.10-opengl_include_fix-1.patch) -build () { +build() { cd SDL2-$version + # https://www.mail-archive.com/blfs-book@lists.linuxfromscratch.org/msg40028.h... + patch -p1 -i $SRC/SDL2-2.0.10-opengl_include_fix-1.patch + CONFIG_SHELL=/bin/bash \ ./configure \ --prefix=/usr \ diff --git a/libsdl2-32/SDL2-2.0.10-opengl_include_fix-1.patch b/libsdl2-32/SDL2-2.0.10-opengl_include_fix-1.patch new file mode 100644 index 0000000..a03393a --- /dev/null +++ b/libsdl2-32/SDL2-2.0.10-opengl_include_fix-1.patch @@ -0,0 +1,44 @@ +Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> +Date: 2019-10-29 +Initial Package Version: 2.0.10 +Upstream Status: Submitted +Origin: Self +Description: Fixes problems with compilation on i686 systems by + including compatible versions of the OpenGL data types. + See BLFS Ticket #12633. + +diff -Naurp SDL2-2.0.10.orig/include/SDL_opengl_glext.h SDL2-2.0.10/include/SDL_opengl_glext.h +--- SDL2-2.0.10.orig/include/SDL_opengl_glext.h 2019-07-24 23:32:36.000000000 -0500 ++++ SDL2-2.0.10/include/SDL_opengl_glext.h 2019-10-29 20:00:11.739525454 -0500 +@@ -1,5 +1,6 @@ + #ifndef __glext_h_ + #define __glext_h_ 1 ++#endif + + #ifdef __cplusplus + extern "C" { +@@ -43,6 +44,14 @@ extern "C" { + #include <windows.h> + #endif + ++#ifdef __IPHONEOS__ ++#include <OpenGLES/ES1/gl.h> ++#include <OpenGLES/ES1/glext.h> ++#else ++#include <GLES/gl.h> ++#include <GLES/glext.h> ++#endif ++ + #ifndef APIENTRY + #define APIENTRY + #endif +@@ -469,9 +478,6 @@ GLAPI void APIENTRY glBlendEquation (GLe + typedef long GLsizeiptr; + typedef long GLintptr; + #else +-typedef ptrdiff_t GLsizeiptr; +-typedef ptrdiff_t GLintptr; +-#endif + #define GL_BUFFER_SIZE 0x8764 + #define GL_BUFFER_USAGE 0x8765 + #define GL_QUERY_COUNTER_BITS 0x8864