commit 832128e59b544e6473ce622a1dd614f32c5cc72e Author: Matt Housh <jaeger@crux.ninja> Date: Sat Sep 3 15:08:00 2022 -0500 libglvnd-32: updated to version 1.5.0, converted to meson to sync with libglvnd diff --git a/libglvnd-32/.footprint b/libglvnd-32/.footprint index bd54dd9..6561a8d 100644 --- a/libglvnd-32/.footprint +++ b/libglvnd-32/.footprint @@ -1,38 +1,27 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ --rwxr-xr-x root/root usr/lib32/libEGL.la --rwxr-xr-x root/root usr/lib32/libEGL.so.1.1.0 +lrwxrwxrwx root/root usr/lib32/libEGL.so -> libEGL.so.1 lrwxrwxrwx root/root usr/lib32/libEGL.so.1 -> libEGL.so.1.1.0 -lrwxrwxrwx root/root usr/lib32/libEGL.so -> libEGL.so.1.1.0 --rwxr-xr-x root/root usr/lib32/libGLdispatch.la --rwxr-xr-x root/root usr/lib32/libGLdispatch.so.0.0.0 -lrwxrwxrwx root/root usr/lib32/libGLdispatch.so.0 -> libGLdispatch.so.0.0.0 -lrwxrwxrwx root/root usr/lib32/libGLdispatch.so -> libGLdispatch.so.0.0.0 --rwxr-xr-x root/root usr/lib32/libGLESv1_CM.la --rwxr-xr-x root/root usr/lib32/libGLESv1_CM.so.1.2.0 -lrwxrwxrwx root/root usr/lib32/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.2.0 -lrwxrwxrwx root/root usr/lib32/libGLESv1_CM.so -> libGLESv1_CM.so.1.2.0 --rwxr-xr-x root/root usr/lib32/libGLESv2.la --rwxr-xr-x root/root usr/lib32/libGLESv2.so.2.1.0 -lrwxrwxrwx root/root usr/lib32/libGLESv2.so.2 -> libGLESv2.so.2.1.0 -lrwxrwxrwx root/root usr/lib32/libGLESv2.so -> libGLESv2.so.2.1.0 --rwxr-xr-x root/root usr/lib32/libGL.la --rwxr-xr-x root/root usr/lib32/libGL.so.1.7.0 +-rwxr-xr-x root/root usr/lib32/libEGL.so.1.1.0 +lrwxrwxrwx root/root usr/lib32/libGL.so -> libGL.so.1 lrwxrwxrwx root/root usr/lib32/libGL.so.1 -> libGL.so.1.7.0 -lrwxrwxrwx root/root usr/lib32/libGL.so -> libGL.so.1.7.0 --rwxr-xr-x root/root usr/lib32/libGLX.la --rwxr-xr-x root/root usr/lib32/libGLX.so.0.0.0 +-rwxr-xr-x root/root usr/lib32/libGL.so.1.7.0 +lrwxrwxrwx root/root usr/lib32/libGLESv2.so -> libGLESv2.so.2 +lrwxrwxrwx root/root usr/lib32/libGLESv2.so.2 -> libGLESv2.so.2.1.0 +-rwxr-xr-x root/root usr/lib32/libGLESv2.so.2.1.0 +lrwxrwxrwx root/root usr/lib32/libGLX.so -> libGLX.so.0 lrwxrwxrwx root/root usr/lib32/libGLX.so.0 -> libGLX.so.0.0.0 -lrwxrwxrwx root/root usr/lib32/libGLX.so -> libGLX.so.0.0.0 --rwxr-xr-x root/root usr/lib32/libOpenGL.la --rwxr-xr-x root/root usr/lib32/libOpenGL.so.0.0.0 +-rwxr-xr-x root/root usr/lib32/libGLX.so.0.0.0 +lrwxrwxrwx root/root usr/lib32/libGLdispatch.so -> libGLdispatch.so.0 +lrwxrwxrwx root/root usr/lib32/libGLdispatch.so.0 -> libGLdispatch.so.0.0.0 +-rwxr-xr-x root/root usr/lib32/libGLdispatch.so.0.0.0 +lrwxrwxrwx root/root usr/lib32/libOpenGL.so -> libOpenGL.so.0 lrwxrwxrwx root/root usr/lib32/libOpenGL.so.0 -> libOpenGL.so.0.0.0 -lrwxrwxrwx root/root usr/lib32/libOpenGL.so -> libOpenGL.so.0.0.0 +-rwxr-xr-x root/root usr/lib32/libOpenGL.so.0.0.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/egl.pc --rw-r--r-- root/root usr/lib32/pkgconfig/glesv1_cm.pc --rw-r--r-- root/root usr/lib32/pkgconfig/glesv2.pc -rw-r--r-- root/root usr/lib32/pkgconfig/gl.pc +-rw-r--r-- root/root usr/lib32/pkgconfig/glesv2.pc -rw-r--r-- root/root usr/lib32/pkgconfig/glx.pc -rw-r--r-- root/root usr/lib32/pkgconfig/libglvnd.pc -rw-r--r-- root/root usr/lib32/pkgconfig/opengl.pc diff --git a/libglvnd-32/.signature b/libglvnd-32/.signature index 0229cb8..e1e6cef8 100644 --- a/libglvnd-32/.signature +++ b/libglvnd-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXd/CrRusjoeg851LPxjbac1IivjiKwfLlDCGvN1fXtGo2AVP3D4fIH+6kUMwbjX7yZ6ceFgvJICAgyP8EJ8BigI= -SHA256 (Pkgfile) = c0f7f5136dfadf354e60a70a16d5f935368efbac09d2a19fdbc8ca41a66f8daf -SHA256 (.footprint) = 315d58de9b92228575dd7f40aa6c503af2e7dcbf4d6a551d2593002f23c31e92 -SHA256 (libglvnd-1.4.0.tar.gz) = 1eb5c2be8d213ad5d31cfb4efbb331d42f3d9f5617c885ce7e89f572ec2bb4b8 +RWSwxGo/zH7eXfdlvN3Ixnjz03rOtlcNWGSiJ8Qw8vnNOtvVDL8YEDyBEUDa14FeIHAdnVy/eFnxWJDKYpNVm7q+XmbBa9PCGQM= +SHA256 (Pkgfile) = 5e3da66b004ac1da38c1a5e8e5635403d4a522075d9bf321931773dcba6b6d8a +SHA256 (.footprint) = d18046727ffe4cb35beadbacd9a29fdc9872c9764c7ed3395c062b11bafa8cd5 +SHA256 (libglvnd-1.5.0.tar.gz) = abdf8229c86358f651e35bdc7cfced0fdf67d0a2acdf9197d08a9732ef7b53bc diff --git a/libglvnd-32/Pkgfile b/libglvnd-32/Pkgfile index edb1d24..926fa05 100644 --- a/libglvnd-32/Pkgfile +++ b/libglvnd-32/Pkgfile @@ -4,18 +4,27 @@ # Depends on: libglvnd xorg-libxext-32 name=libglvnd-32 -version=1.4.0 +version=1.5.0 release=1 source=(https://github.com/NVIDIA/${name%-32}/archive/v$version/${name%-32}-$version.tar.gz) build() { - cd ${name%-32}-$version - ./autogen.sh - ./configure --prefix=/usr \ - --disable-headers \ - --build=i686-unknown-linux-gnu \ - --libdir=/usr/lib32 - make - make DESTDIR=$PKG install - rm -r $PKG/usr/include + export CC='gcc -m32' + export GCC='g++ -m32' + PKGMK_GLVND+=' -D x11=enabled -D glx=enabled' + + meson setup libglvnd-$version build $PKGMK_GLVND \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=false \ + -D gles1=false \ + -D egl=true \ + -D tls=false + meson compile -C build + DESTDIR=$PKG meson install -C build + + rm -r $PKG/usr/include }