[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/mesa-amber][debian-unstable] 3 commits: Build libosmesa, as mesa dropped it in 25.1, and bump the epoch.



Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / Mesa Amber

Commits:

  • 2d0286c3
    by Timo Aaltonen at 2025-08-27T14:14:29+03:00
    Build libosmesa, as mesa dropped it in 25.1, and bump the epoch.
    
  • 2e92ea9d
    by Timo Aaltonen at 2025-08-27T14:14:36+03:00
    copyright: Updated.
    
  • 1800dfbe
    by Timo Aaltonen at 2025-08-27T14:15:03+03:00
    control: Migrate to pkgconf.
    

9 changed files:

Changes:

  • debian/changelog
    1
    -mesa-amber (21.3.9-2) UNRELEASED; urgency=medium
    
    1
    +mesa-amber (1:21.3.9-2) UNRELEASED; urgency=medium
    
    2 2
     
    
    3 3
       * Build libglapi-amber, since mesa dropped the libglapi package.
    
    4
    +  * Build libosmesa, as mesa dropped it in 25.1, and bump the epoch.
    
    5
    +  * copyright: Updated.
    
    6
    +  * control: Migrate to pkgconf.
    
    4 7
     
    
    5 8
      -- Timo Aaltonen <tjaalton@debian.org>  Fri, 08 Aug 2025 10:51:20 +0300
    
    6 9
     
    

  • debian/control
    ... ... @@ -31,7 +31,7 @@ Build-Depends:
    31 31
      libzstd-dev,
    
    32 32
      linux-libc-dev (>= 2.6.31) [linux-any],
    
    33 33
      meson (>= 0.45),
    
    34
    - pkg-config,
    
    34
    + pkgconf,
    
    35 35
      python3,
    
    36 36
      python3-mako,
    
    37 37
      python3-setuptools,
    
    ... ... @@ -115,3 +115,36 @@ Description: free implementation of the GL API -- shared library
    115 115
      The Mesa GL API module is responsible for dispatching all the gl*
    
    116 116
      functions. It is intended to be mainly used by libgl1-amber-dri
    
    117 117
      package.
    
    118
    +
    
    119
    +Package: libosmesa6
    
    120
    +Section: libs
    
    121
    +Architecture: any
    
    122
    +Depends:
    
    123
    + ${shlibs:Depends},
    
    124
    + ${misc:Depends},
    
    125
    +Pre-Depends: ${misc:Pre-Depends}
    
    126
    +Multi-Arch: same
    
    127
    +Description: Mesa Off-screen rendering extension
    
    128
    + OSmesa is a Mesa extension that allows programs to render to an
    
    129
    + off-screen buffer using the OpenGL API without having to create a
    
    130
    + rendering context on an X Server.  It uses a pure software renderer.
    
    131
    + .
    
    132
    + This package provides both 16-bit and 32-bit versions of the off-screen
    
    133
    + renderer which do not require external libraries to work.
    
    134
    +
    
    135
    +Package: libosmesa6-dev
    
    136
    +Section: libdevel
    
    137
    +Architecture: any
    
    138
    +Depends:
    
    139
    + libosmesa6 (= ${binary:Version}),
    
    140
    + mesa-common-dev | libgl-dev,
    
    141
    + ${misc:Depends},
    
    142
    +Conflicts: libosmesa-dev
    
    143
    +Replaces: libosmesa-dev
    
    144
    +Provides: libosmesa-dev
    
    145
    +Multi-Arch: same
    
    146
    +Description: Mesa Off-screen rendering extension -- development files
    
    147
    + This package provides the required environment for developing programs
    
    148
    + that use the off-screen rendering extension of Mesa.
    
    149
    + .
    
    150
    + For more information on OSmesa see the libosmesa6 package.

  • debian/copyright
    ... ... @@ -127,11 +127,23 @@ Files: include/GL/glcorearb.h
    127 127
     Copyright: 2013-2017 The Khronos Group Inc.
    
    128 128
     License: Khronos
    
    129 129
     
    
    130
    -Files: include/GLES/egl.h
    
    131
    -       include/GLES/glplatform.h
    
    132
    -       include/GLES2/gl2platform.h
    
    133
    -       include/GLES3/gl3platform.h
    
    134
    -       include/vulkan/*
    
    130
    +Files:
    
    131
    +	include/CL/cl.h
    
    132
    +	include/CL/cl_ext.h
    
    133
    +	include/CL/cl_ext_intel.h
    
    134
    +	include/CL/cl_icd.h
    
    135
    +	include/CL/cl_platform.h
    
    136
    +	include/CL/cl_version.h
    
    137
    +	include/EGL/egl.h
    
    138
    +	include/EGL/eglext.h
    
    139
    +	include/GLES/egl.h
    
    140
    +	include/GLES/glplatform.h
    
    141
    +	include/GLES2/gl2platform.h
    
    142
    +	include/GLES3/gl3platform.h
    
    143
    +	include/android/*
    
    144
    +	include/vulkan/*
    
    145
    +	src/egl/generate/egl.xml
    
    146
    +	src/mapi/glapi/registry/gl.xml
    
    135 147
     Copyright: 2015-2018 The Khronos Group Inc.
    
    136 148
     	   2015 The Android Open Source Project
    
    137 149
     	   2015-2016 Valve Corporation
    
    ... ... @@ -177,6 +189,21 @@ Files: src/gtest/include/* src/gtest/src/*
    177 189
     Copyright: 2008-2015 Google, Inc.
    
    178 190
     License: BSD-3-google
    
    179 191
     
    
    192
    +Files: src/imgui/*
    
    193
    +Copyright: 2014-2019 Omar Cornut
    
    194
    +License: MIT
    
    195
    +
    
    196
    +Files: src/imgui/imstb_rectpack.h
    
    197
    +Copyright: 2014-2017 Sean Barrett
    
    198
    +                  2019 Jeremy Jaussaud
    
    199
    +		  2019 Martins Mozeiko
    
    200
    +		  2019 github:IntellectualKitty
    
    201
    +License: MIT or public-domain
    
    202
    +
    
    203
    +Files: src/vulkan/registry/vk.xml
    
    204
    +Copyright: 2015-2021 The Khronos Group Inc.
    
    205
    +License: Apache-2.0 or MIT
    
    206
    +
    
    180 207
     Files: debian/*
    
    181 208
     Copyright: 2022 Timo Aaltonen <tjaalton@debian.org>
    
    182 209
     License: MIT
    

  • debian/libosmesa6-dev.install
    1
    +usr/include/GL/osmesa.h
    
    2
    +usr/lib/*/libOSMesa.so
    
    3
    +usr/lib/*/pkgconfig/osmesa.pc

  • debian/libosmesa6.install
    1
    +usr/lib/*/libOSMesa.so.*

  • debian/libosmesa6.links.in
    1
    +usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.8   usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.6

  • debian/libosmesa6.lintian-overrides
    1
    +package-name-doesnt-match-sonames libOSMesa8

  • debian/libosmesa6.shlibs
    1
    +libOSMesa 8 libosmesa6 (>= 10.2~)

  • debian/rules
    ... ... @@ -37,7 +37,6 @@ DRI_DRIVERS =
    37 37
     EGL_PLATFORMS = x11
    
    38 38
     
    
    39 39
     confflags_DRI3 = -Ddri3=disabled
    
    40
    -confflags_OSMESA =  -Dosmesa=false
    
    41 40
     confflags_SSE2 = -Dsse2=true
    
    42 41
     
    
    43 42
     # hurd doesn't do direct rendering
    
    ... ... @@ -92,8 +91,10 @@ confflags += \
    92 91
     	-Ddri3=disabled \
    
    93 92
     	-Dgles1=disabled \
    
    94 93
     	-Dgles2=disabled \
    
    95
    -	-Dosmesa=false \
    
    94
    +	-Dosmesa=true \
    
    96 95
     	-Dllvm=disabled \
    
    96
    +	-Dgallium-drivers=swrast \
    
    97
    +	-Dlibunwind=disabled \
    
    97 98
     	$(confflags_DIRECT_RENDERING) \
    
    98 99
     	$(confflags_EGL) \
    
    99 100
     	$(confflags_SSE2)
    
    ... ... @@ -135,8 +136,10 @@ override_dh_install:
    135 136
     	rm debian/tmp/usr/lib/*/libEGL_amber.so
    
    136 137
     	rm debian/tmp/usr/lib/*/libGLX_amber.so
    
    137 138
     	rm -r debian/tmp/usr/include/EGL
    
    138
    -	rm -r debian/tmp/usr/include/GL/
    
    139
    +	rm debian/tmp/usr/include/GL/internal/dri_interface.h
    
    139 140
     	rm debian/tmp/usr/lib/*/pkgconfig/dri.pc
    
    141
    +	rm debian/tmp/usr/lib/*/dri/kms_swrast_dri.so
    
    142
    +	rm debian/tmp/usr/lib/*/dri/swrast_dri.so
    
    140 143
     
    
    141 144
     	# Copy the hardlinked *_dri.so correctly.
    
    142 145
     	install -m755 -d debian/libgl1-amber-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
    


  • Reply to: