wok-current diff xorg-xf86-video-intel/receipt @ rev 25733
Accept licence PyQt-x11-gpl, bump firmware* to 20240610, build imagemagick (merge)
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Fri Dec 20 16:13:23 2024 +0000 (11 days ago) |
parents | 3ad63c8fc2f9 |
children |
line diff
1.1 --- a/xorg-xf86-video-intel/receipt Sun Jan 14 08:12:37 2024 +0000 1.2 +++ b/xorg-xf86-video-intel/receipt Fri Dec 20 16:13:23 2024 +0000 1.3 @@ -10,10 +10,14 @@ 1.4 WEB_SITE="https://www.x.org/wiki/" 1.5 1.6 SOURCE="xf86-video-intel" 1.7 -TARBALL="$SOURCE-$VERSION.tar.bz2" 1.8 -#WGET_URL="$XORG_MIRROR/driver/$TARBALL" 1.9 -WGET_URL="git|git://anongit.freedesktop.org/xorg/driver/xf86-video-intel" 1.10 -BRANCH="d39197bb10b7d88cb4c456e7a5e8d34c1dc6eeaf" 1.11 +case $SLITAZ_ARCH in 1.12 + i?86) 1.13 + BRANCH="d39197bb" ;; 1.14 + x86_64) 1.15 + BRANCH="a511f22c" ;; 1.16 +esac 1.17 +TARBALL="$SOURCE-$VERSION-$BRANCH.tar.bz2" 1.18 +WGET_URL="git|https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git" 1.19 1.20 DEPENDS="libdrm libdrm-intel mesa-dri-intel xcb-util xorg-libXfont2 \ 1.21 xorg-libXvMC xorg-server" 1.22 @@ -22,6 +26,8 @@ 1.23 1.24 MODS='/usr/lib/X11/modules' 1.25 1.26 +HOST_ARCH="i486 x86_64" 1.27 + 1.28 current_version() 1.29 { 1.30 wget -O - $(dirname $WGET_URL) 2>/dev/null | \ 1.31 @@ -31,18 +37,21 @@ 1.32 # Rules to configure and make the package. 1.33 compile_rules() 1.34 { 1.35 - # Patch from use driver with new Xorg 1.36 - # see https://gnats.netbsd.org/51687 1.37 - patch -Np1 < $stuff/patch-src_compat-api.h 1.38 - patch -Np1 < $stuff/patch-src_legacy_i810_i810__video.c 1.39 - patch -Np1 < $stuff/patch-src_sna_sna__accel.c 1.40 - patch -Np1 < $stuff/patch-src_sna_sna__acpi.c 1.41 - patch -Np1 < $stuff/patch-src_sna_sna__driver.c 1.42 - patch -Np1 < $stuff/patch-src_sna_sna.h 1.43 - patch -Np1 < $stuff/patch-src_uxa_intel__display.c 1.44 - patch -Np1 < $stuff/patch-src_uxa_intel.h 1.45 - # see https://lists.x.org/archives/xorg-devel/2018-May/056924.html 1.46 - patch -Np1 < $stuff/patch2-src_sna_sna__accel.c 1.47 + case $SLITAZ_ARCH in 1.48 + i?86) 1.49 + # Patch from use driver with new Xorg 1.50 + # see https://gnats.netbsd.org/51687 1.51 + patch -Np1 < $stuff/patch-src_compat-api.h 1.52 + patch -Np1 < $stuff/patch-src_legacy_i810_i810__video.c 1.53 + patch -Np1 < $stuff/patch-src_sna_sna__accel.c 1.54 + patch -Np1 < $stuff/patch-src_sna_sna__acpi.c 1.55 + patch -Np1 < $stuff/patch-src_sna_sna__driver.c 1.56 + patch -Np1 < $stuff/patch-src_sna_sna.h 1.57 + patch -Np1 < $stuff/patch-src_uxa_intel__display.c 1.58 + patch -Np1 < $stuff/patch-src_uxa_intel.h 1.59 + # see https://lists.x.org/archives/xorg-devel/2018-May/056924.html 1.60 + patch -Np1 < $stuff/patch2-src_sna_sna__accel.c 1.61 + esac 1.62 1.63 # Patch to fix build for i686 1.64 # see https://src.fedoraproject.org/rpms/xorg-x11-drv-intel/c/f2e86334f3a168b04afddb57d4bc4f630e59a5e9 1.65 @@ -55,17 +64,29 @@ 1.66 # Update src 1.67 autoreconf -i 1.68 1.69 - # disable dri3, need check to add support 1.70 + case $SLITAZ_ARCH in 1.71 + i?86) 1.72 + # disable dri3, need check to add support 1.73 + ./configure \ 1.74 + --sysconfdir=/etc \ 1.75 + --mandir=/usr/share/man \ 1.76 + --localstatedir=/var \ 1.77 + --with-xorg-module-dir=$MODS \ 1.78 + --enable-dri \ 1.79 + --enable-dri3 \ 1.80 + --enable-xvmc \ 1.81 + $CONFIGURE_ARGS ;; 1.82 + x86_64) 1.83 + ./configure \ 1.84 + --sysconfdir=/etc \ 1.85 + --mandir=/usr/share/man \ 1.86 + --localstatedir=/var \ 1.87 + --with-xorg-module-dir=$MODS \ 1.88 + --with-default-dri=3 \ 1.89 + --enable-xvmc \ 1.90 + $CONFIGURE_ARGS ;; 1.91 + esac 1.92 1.93 - ./configure \ 1.94 - --sysconfdir=/etc \ 1.95 - --mandir=/usr/share/man \ 1.96 - --localstatedir=/var \ 1.97 - --with-xorg-module-dir=$MODS \ 1.98 - --enable-dri \ 1.99 - --disable-dri3 \ 1.100 - --enable-xvmc \ 1.101 - $CONFIGURE_ARGS && 1.102 make && 1.103 make install 1.104 }