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

[Git][xorg-team/lib/mesa][debian-experimental] 5 commits: control, rules: Drop armel, mips64el, loong64 from NVK_ARCHS (FTBFS).

Title: GitLab

Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa

Commits:

  • 9f455cb9
    by Timo Aaltonen at 2024-08-15T08:27:53+03:00 
    control, rules: Drop armel, mips64el, loong64 from NVK_ARCHS (FTBFS).
  • cfa55f02
    by Timo Aaltonen at 2024-08-15T08:32:54+03:00 
    rules: ORCJIT is enabled by default now, so don't force draw-use- llvm=false on riscv64.
  • 3dc82b33
    by Timo Aaltonen at 2024-08-15T08:53:19+03:00 
    rules: Fix m68k build, and rework setting buildflags. (Closes: #1067207)
  • a1be7c0b
    by Timo Aaltonen at 2024-08-15T08:58:49+03:00 
    rules: Really drop ppc64el from optimization workaround, drop sh3 as it's an obsolete arch, and for sh4 limit it to just setting a single flag.
  • 98e7519b
    by Timo Aaltonen at 2024-08-15T09:15:13+03:00 
    releasing package mesa version 24.2.0-2

3 changed files:

Changes:

  • debian/changelog
    1 
    +mesa (24.2.0-2) experimental; urgency=medium
    2 
    +
    3 
    +  * control, rules: Drop armel, mips64el, loong64 from NVK_ARCHS (FTBFS).
    4 
    +  * rules: ORCJIT is enabled by default now, so don't force draw-use-
    5 
    +    llvm=false on riscv64.
    6 
    +  * rules: Fix m68k build, and rework setting buildflags. (Closes:
    7 
    +    #1067207)
    8 
    +  * rules: Really drop ppc64el from optimization workaround, drop sh3 as
    9 
    +    it's an obsolete arch, and for sh4 limit it to just setting a single
    10 
    +    flag.
    11 
    +
    12 
    + -- Timo Aaltonen <tjaalton@debian.org>  Thu, 15 Aug 2024 09:14:51 +0300
    13 
    +
    1 14 
     mesa (24.2.0-1) experimental; urgency=medium
    2 15
    3 16 
       * New upstream release.

  • debian/control
    ... ... @@ -65,8 +65,8 @@ Build-Depends:
    65 65 
      cbindgen [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    66 66 
      llvm-spirv-18 [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32],
    67 67 
      libllvmspirvlib-18-dev [amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
    68 
    - librust-paste-dev [amd64 arm64 armel armhf i386 loong64 mips64el ppc64 riscv64 x32],
    69 
    - librust-syn-dev [amd64 arm64 armel armhf i386 loong64 mips64el ppc64 riscv64 x32],
    68 
    + librust-paste-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
    69 
    + librust-syn-dev [amd64 arm64 armhf i386 ppc64 riscv64 x32],
    70 70 
     Rules-Requires-Root: no
    71 71 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/mesa.git
    72 72 
     Vcs-Browser: https://salsa.debian.org/xorg-team/lib/mesa

  • debian/rules
    ... ... @@ -19,20 +19,25 @@ export PATH:=/usr/lib/llvm-$(LLVM_VERSION)/bin/:$(PATH)
    19 19 
     export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
    20 20 
     export MESON_PACKAGE_CACHE_DIR=/usr/share/cargo/registry/
    21 21
    22 
    -ifeq (,$(filter $(DEB_HOST_ARCH), armhf ppc64el sh3 sh4))
    23 
    -buildflags = \
    24 
    -	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
    25 
    -else
    26 
    -  ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
    22 
    +DEB_CFLAGS_MAINT_APPEND := -Wall
    23 
    +DEB_CXXFLAGS_MAINT_APPEND := -Wall
    24 
    +ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
    27 25 
       # Workaround for a variant of LP: #725126
    28 
    -  buildflags = \
    29 
    -	$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" DEB_CXXFLAGS_MAINT_APPEND="-Wall -fno-optimize-sibling-calls" dpkg-buildflags --export=configure)
    30 
    -  else
    31 
    -    # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143
    32 
    -    buildflags = \
    33 
    -	$(shell DEB_CFLAGS_MAINT_APPEND="-Wall -O1" DEB_CXXFLAGS_MAINT_APPEND="-Wall -O1" dpkg-buildflags --export=configure)
    34 
    -  endif
    26 
    +  DEB_CFLAGS_MAINT_APPEND += -fno-optimize-sibling-calls
    27 
    +  DEB_CXXFLAGS_MAINT_APPEND += -fno-optimize-sibling-calls
    28 
    +else ifneq (,$(filter $(DEB_HOST_ARCH), m68k))
    29 
    +  # This library has huge jump tables: Debian #1067207
    30 
    +  DEB_CFLAGS_MAINT_APPEND += -mlong-jump-table-offsets
    31 
    +  DEB_CXXFLAGS_MAINT_APPEND += -mlong-jump-table-offsets
    32 
    +else ifneq (,$(filter $(DEB_HOST_ARCH), sh4))
    33 
    +  # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143
    34 
    +  DEB_CFLAGS_MAINT_APPEND += -freorder-blocks-algorithm=simple
    35 
    +  DEB_CXXFLAGS_MAINT_APPEND += -freorder-blocks-algorithm=simple
    35 36 
     endif
    37 
    +buildflags = $(shell \
    38 
    +	DEB_CFLAGS_MAINT_APPEND='$(DEB_CFLAGS_MAINT_APPEND)' \
    39 
    +	DEB_CXXFLAGS_MAINT_APPEND='$(DEB_CXXFLAGS_MAINT_APPEND)' \
    40 
    +	dpkg-buildflags --export=configure)
    36 41
    37 42 
     EGL_PLATFORMS = x11
    38 43 
     GALLIUM_DRIVERS =
    ... ... @@ -46,7 +51,7 @@ confflags_TEFLON = -Dteflon=false
    46 51
    47 52 
     LLVM_ARCHS     = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x sparc64 x32
    48 53 
     RUSTICL_ARCHS  = amd64 arm64 armel armhf i386 loong64 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
    49 
    -NVK_ARCHS      = amd64 arm64 armel armhf i386 loong64 mips64el ppc64 riscv64 x32
    54 
    +NVK_ARCHS      = amd64 arm64 armhf i386 ppc64 riscv64 x32
    50 55 
     VALGRIND_ARCHS = amd64 arm64 armhf i386 mips64el powerpc ppc64 ppc64el s390x
    51 56 
     WINE_ARCHS     = amd64 arm64 armel armhf i386
    52 57
    ... ... @@ -110,17 +115,11 @@ else
    110 115 
       ifneq (,$(filter $(DEB_HOST_ARCH), $(LLVM_ARCHS)))
    111 116 
     	GALLIUM_DRIVERS += radeonsi zink llvmpipe
    112 117
    113 
    -	# Only enable amd on riscv64, swrast needs CPU JIT support which doesn't work properly yet
    114 
    -	ifneq (,$(filter $(DEB_HOST_ARCH), riscv64))
    115 
    -		VULKAN_DRIVERS += amd
    116 
    -		confflags_GALLIUM += -Ddraw-use-llvm=false
    117 
    -	else
    118 
    -	  # drop virtio from armel, it doesn't build
    119 
    -	  ifneq (,$(filter $(DEB_HOST_ARCH), armel))
    118 
    +	# drop virtio from armel, it doesn't build
    119 
    +	ifneq (,$(filter $(DEB_HOST_ARCH), armel))
    120 120 
     		VULKAN_DRIVERS += amd swrast
    121 
    -	  else
    121 
    +	else
    122 122 
     		VULKAN_DRIVERS += amd swrast virtio
    123 
    -	  endif
    124 123 
     	endif
    125 124
    126 125 
     	VULKAN_LAYERS += device-select intel-nullhw overlay

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: