Skip to content
Snippets Groups Projects
Commit fd7be29e authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

fix merge conflicts

parents f310f911 f929a8c5
No related branches found
No related tags found
No related merge requests found
Pipeline #883 failed
Stage: build
Stage: commit
Hide whitespace changes
Inline Side-by-side
trunk/0001_revert_dpi_calculation.patch deleted 100644 → 0
+ 0
− 118
View file @ f310f911
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 0389945a7cf0e18545cbe101639b62cd01f1e276..d03382d263399bba67dc77f6525480f751674bcc 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -55,6 +55,7 @@
#include "xf86Xinput.h"
#include "xf86InPriv.h"
#include "mivalidate.h"
+#include "xf86Crtc.h"
/* For xf86GetClocks */
#if defined(CSRG_BASED) || defined(__GNU__)
@@ -851,8 +852,9 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
{
MessageType from = X_DEFAULT;
xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC);
- int ddcWidthmm, ddcHeightmm;
+ int probedWidthmm, probedHeightmm;
int widthErr, heightErr;
+ xf86OutputPtr compat = xf86CompatOutput(pScrn);
/* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */
pScrn->widthmm = pScrn->monitor->widthmm;
@@ -862,11 +864,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
/* DDC gives display size in mm for individual modes,
* but cm for monitor
*/
- ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */
- ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
+ probedWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */
+ probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
+ }
+ else if (compat && compat->mm_width > 0 && compat->mm_height > 0) {
+ probedWidthmm = compat->mm_width;
+ probedHeightmm = compat->mm_height;
}
else {
- ddcWidthmm = ddcHeightmm = 0;
+ probedWidthmm = probedHeightmm = 0;
}
if (monitorResolution > 0) {
@@ -892,15 +898,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
pScrn->widthmm, pScrn->heightmm);
/* Warn if config and probe disagree about display size */
- if (ddcWidthmm && ddcHeightmm) {
+ if (probedWidthmm && probedHeightmm) {
if (pScrn->widthmm > 0) {
- widthErr = abs(ddcWidthmm - pScrn->widthmm);
+ widthErr = abs(probedWidthmm - pScrn->widthmm);
}
else {
widthErr = 0;
}
if (pScrn->heightmm > 0) {
- heightErr = abs(ddcHeightmm - pScrn->heightmm);
+ heightErr = abs(probedHeightmm - pScrn->heightmm);
}
else {
heightErr = 0;
@@ -909,17 +915,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
/* Should include config file name for monitor here */
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
- ddcWidthmm, ddcHeightmm, pScrn->widthmm,
+ probedWidthmm, probedHeightmm, pScrn->widthmm,
pScrn->heightmm);
}
}
}
- else if (ddcWidthmm && ddcHeightmm) {
+ else if (probedWidthmm && probedHeightmm) {
from = X_PROBED;
xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
- ddcWidthmm, ddcHeightmm);
- pScrn->widthmm = ddcWidthmm;
- pScrn->heightmm = ddcHeightmm;
+ probedWidthmm, probedHeightmm);
+ pScrn->widthmm = probedWidthmm;
+ pScrn->heightmm = probedHeightmm;
if (pScrn->widthmm > 0) {
pScrn->xDpi =
(int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm);
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index c6e89e66f690cd7e2a26a3d4b663f9f146cd84e0..202791774b31d6c349f27ed692c1b4ea7f1fdca4 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3256,8 +3256,10 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon)
free(output->MonInfo);
output->MonInfo = edid_mon;
- output->mm_width = 0;
- output->mm_height = 0;
+ if (edid_mon) {
+ output->mm_width = 0;
+ output->mm_height = 0;
+ }
if (debug_modes) {
xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 50cbd043edc8380a3307dfcd5dee9cb280a50ba9..d4651f4e856f9fbe8b87086405401e4c0989b409 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -806,6 +806,12 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen)
mmWidth = output->conf_monitor->mon_width;
mmHeight = output->conf_monitor->mon_height;
}
+ else if (output &&
+ (output->mm_width > 0 &&
+ output->mm_height > 0)) {
+ mmWidth = output->mm_width;
+ mmHeight = output->mm_height;
+ }
else {
/*
* Otherwise, just set the screen to DEFAULT_DPI
trunk/PKGBUILD
+ 309
− 6
View file @ fd7be29e
<<<<<<< HEAD
#!/usr/bin/bash
# Maintainer : Obarun Packagers <pkg@obarun.org>
# Obarun PkgSrc : https://git.obarun.org/obarun-pkgbuild-extra/xorg-server
=======
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Maintainer : YianIris <yianiris At disroot Dot org>
# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
>>>>>>> refs/remotes/origin/master
#----------------
# Website : http://xorg.freedesktop.org
#------------------------------------------------------------------------
#--------------------------------------------------------------
# DESCRIPTION ]
pkgbase=xorg-server
pkgver=21.1.1
pkgrel=4
pkgname=(
<<<<<<< HEAD
'xorg-server'
'xorg-server-xephyr'
'xorg-server-xvfb'
......@@ -31,14 +39,33 @@ source=($url/${pkgbase}-${pkgver}.tar.xz{,.sig}
arch=('x86_64')
groups=('xorg')
backup=(
'etc/X11/Xwrapper.config')
=======
'xorg-server'
'xorg-server-xephyr'
'xorg-server-xvfb'
'xorg-server-xnest'
'xorg-server-common'
'xorg-server-devel'
)
url='https://xorg.freedesktop.org'
>>>>>>> refs/remotes/origin/master
track=releases/individual/xserver
target=$pkgbase-$pkgver
source=(
https://xorg.freedesktop.org/$track/$target.tar.xz{,.sig}
xvfb-run # with updates from FC master
xvfb-run.1
Xwrapper.config
0001_revert_dpi_calculation.patch
)
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
<<<<<<< HEAD
'xorgproto'
'pixman'
'libx11'
......@@ -67,22 +94,74 @@ makedepends=(
'libxshmfence'
'libunwind'
'meson')
=======
'xorgproto'
'pixman'
'libx11'
'mesa'
'mesa-libgl'
'xtrans'
'libxkbfile'
'libxfont2'
'libpciaccess'
'libxv'
'libxcvt'
'libxmu'
'libxrender'
'libxi'
'libxaw'
'libxtst'
'libxres'
'xorg-xkbcomp'
'xorg-util-macros'
'xorg-font-util'
'libepoxy'
'xcb-util'
'xcb-util-image'
'xcb-util-renderutil'
'xcb-util-wm'
'xcb-util-keysyms'
'libxshmfence'
'libunwind'
'meson'
)
#------------------------
# INSTALL CONFIGURATION ]
groups=(
'xorg'
)
backup=(
'etc/X11/Xwrapper.config'
)
>>>>>>> refs/remotes/origin/master
#--------------------
# BUILD PREPARATION ]
prepare() {
<<<<<<< HEAD
cd "${pkgbase}-${pkgver}"
# revert dpi calculation that leads to unwanted miscalculation results
# https://gitlab.freedesktop.org/xorg/xserver/-/issues/1241
# https://bugs.archlinux.org/task/72661
patch -Rp1 -i ../0001_revert_dpi_calculation.patch
=======
cd $pkgbase-$pkgver
>>>>>>> refs/remotes/origin/master
## revert dpi calculation that leads to unwanted miscalculation results
## https://gitlab.freedesktop.org/xorg/xserver/-/issues/1241
## https://bugs.archlinux.org/task/72661
patch -Rp1 -i ../0001_revert_dpi_calculation.patch
}
#----------------
# BUILD CONTROL ]
<<<<<<< HEAD
build() {
# Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
# With them, module fail to load with undefined symbol.
......@@ -116,9 +195,47 @@ build() {
# fake installation to be seperated into packages
# DESTDIR="${srcdir}/fakeinstall" ninja -C build install
meson install -C build --destdir "${srcdir}/fakeinstall"
=======
_flags=(
-Dipv6=true
-Dxvfb=true
-Dxnest=true
-Dxcsecurity=true
-Dxorg=true
-Dxephyr=true
-Dglamor=true
-Dudev=true
-Ddtrace=false
-Dsystemd_logind=false
-Dsuid_wrapper=true
-Dxkb_dir=/usr/share/X11/xkb
-Dxkb_output_dir=/var/lib/xkb
)
#--------
# BUILD ]
build() {
## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
## With them, module fail to load with undefined symbol.
## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
export CFLAGS=${CFLAGS/-fno-plt}
export CXXFLAGS=${CXXFLAGS/-fno-plt}
export LDFLAGS=${LDFLAGS/,-z,now}
arch-meson $pkgbase-$pkgver build "${_flags[@]}"
## Print config
meson configure build
ninja -C build
## fake installation to be seperated into packages
DESTDIR="$srcdir/fakeinstall" ninja -C build install
>>>>>>> refs/remotes/origin/master
}
_install() {
<<<<<<< HEAD
local src f dir
for src; do
f="${src#fakeinstall/}"
......@@ -162,10 +279,59 @@ package_xorg-server() {
libdrm
libxshmfence # FS#52949
libxcvt)
=======
local src f dir
for src; do
f="${src#fakeinstall/}"
dir="${pkgdir}/${f%/*}"
install -m755 -d "${dir}"
## use copy so a new file is created and fakeroot
## can track properties such as setuid.
cp -av "${src}" "${dir}/"
rm -rf "${src}"
done
}
package_xorg-server-common() {
pkgdesc='Xorg server common files'
depends=(
'xkeyboard-config'
'xorg-xkbcomp'
'xorg-setxkbmap'
)
_install fakeinstall/usr/lib/xorg/protocol.txt
_install fakeinstall/usr/share/man/man1/Xserver.1
install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server() {
pkgdesc="Xorg X server"
depends=(
'libepoxy'
'libxfont2'
'pixman'
'xorg-server-common'
'libunwind'
'dbus'
'libgl'
'xf86-input-libinput'
'nettle'
'libpciaccess'
'libdrm'
'libxshmfence'
'libxcvt'
) ## FS#52949
>>>>>>> refs/remotes/origin/master
## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
## we provide major numbers that drivers can depend on
## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
<<<<<<< HEAD
provides=(
'X-ABI-VIDEODRV_VERSION=25.2'
'X-ABI-XINPUT_VERSION=24.4'
......@@ -278,11 +444,138 @@ package_xorg-server-devel() {
# make sure there are no files left to install
# rm fakeinstall/usr/bin/Xwayland ## no such file
find fakeinstall -depth -print0 | xargs -0 rmdir
=======
provides=(
'X-ABI-VIDEODRV_VERSION=25.2'
'X-ABI-XINPUT_VERSION=24.4'
'X-ABI-EXTENSION_VERSION=10.0'
'x-server'
)
conflicts=(
'nvidia-utils<=331.20'
'glamor-egl'
'xf86-video-modesetting'
)
replaces=(
'glamor-egl'
'xf86-video-modesetting'
)
install=xorg-server.install
_install fakeinstall/usr/bin/{X,Xorg,gtf}
_install fakeinstall/usr/lib/Xorg{,.wrap}
_install fakeinstall/usr/lib/xorg/modules/*
_install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
_install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
_install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
_install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
## distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
## Xwrapper.config
install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xephyr() {
pkgdesc="A nested X server that runs as an X application"
depends=(
'libxfont2'
'libgl'
'libepoxy'
'libunwind'
'libxv'
'pixman'
'xorg-server-common'
'xcb-util-image'
'xcb-util-renderutil'
'xcb-util-wm'
'xcb-util-keysyms'
'nettle'
'libtirpc'
)
_install fakeinstall/usr/bin/Xephyr
_install fakeinstall/usr/share/man/man1/Xephyr.1
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xvfb() {
pkgdesc="Virtual framebuffer X server"
depends=(
'libxfont2'
'libunwind'
'pixman'
'xorg-server-common'
'xorg-xauth'
'libgl'
'nettle'
'libtirpc'
)
_install fakeinstall/usr/bin/Xvfb
_install fakeinstall/usr/share/man/man1/Xvfb.1
install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xnest() {
pkgdesc="A nested X server that runs as an X application"
depends=(
'libxfont2'
'libxext'
'pixman'
'xorg-server-common'
'nettle'
'libtirpc'
)
_install fakeinstall/usr/bin/Xnest
_install fakeinstall/usr/share/man/man1/Xnest.1
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-devel() {
pkgdesc="Development files for the X.Org X server"
depends=(
'xorgproto'
'mesa'
'libpciaccess'
'xorg-util-macros'
) ## not technically required but almost every Xorg pkg needs it to build.
_install fakeinstall/usr/include/xorg/*
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
_install fakeinstall/usr/share/aclocal/xorg-server.m4
## license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
## make sure there are no files left to install
find fakeinstall -depth -print0 | xargs -0 rmdir
>>>>>>> refs/remotes/origin/master
}
#---------------------------
# LICENSE AND VERIFICATION ]
<<<<<<< HEAD
license=('custom')
validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
......@@ -293,3 +586,13 @@ sha512sums=('8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a8
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22' # xvfb-run.1
'97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8' # Xwrapper.config
'28021ef9879d5313096c3e7e79a71a2e15be366652845acf32239d5c011c60aa5938c63c23b04bb0dee56df7b3762b7ca8d51d5925898c67c2ba83ec468fe782') # 0001_revert_dpi_calculation.patch
=======
arch=(x86_64)
license=(custom)
validpgpkeys=(
'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
)
sha512sums=(' ')
>>>>>>> refs/remotes/origin/master
version/21.1.1-4/PKGBUILD
+ 316
− 0
View file @ fd7be29e
<<<<<<< HEAD
#!/usr/bin/bash
# Maintainer : Obarun Packagers <pkg@obarun.org>
# Obarun PkgSrc : https://git.obarun.org/obarun-pkgbuild-extra/xorg-server
......@@ -5,11 +6,23 @@
# Website : http://xorg.freedesktop.org
#------------------------------------------------------------------------
# DESCRIPTION ]
=======
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Maintainer : YianIris <yianiris At disroot Dot org>
# Obarun PkgSrc : https://git.obarun.org/pkg/obextra/xorg-server
#----------------
#--------------------------------------------------------------
# DESCRIPTION ]
>>>>>>> refs/remotes/origin/master
pkgbase=xorg-server
pkgver=21.1.1
pkgrel=4
pkgname=(
<<<<<<< HEAD
'xorg-server'
'xorg-server-xephyr'
'xorg-server-xvfb'
......@@ -25,10 +38,67 @@ source=($url/${pkgbase}-${pkgver}.tar.xz{,.sig}
xvfb-run.1
Xwrapper.config
0001_revert_dpi_calculation.patch)
=======
'xorg-server'
'xorg-server-xephyr'
'xorg-server-xvfb'
'xorg-server-xnest'
'xorg-server-common'
'xorg-server-devel'
)
url='https://xorg.freedesktop.org'
track=releases/individual/xserver
target=$pkgbase-$pkgver
source=(
https://xorg.freedesktop.org/$track/$target.tar.xz{,.sig}
xvfb-run # with updates from FC master
xvfb-run.1
Xwrapper.config
0001_revert_dpi_calculation.patch
)
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
'xorgproto'
'pixman'
'libx11'
'mesa'
'mesa-libgl'
'xtrans'
'libxkbfile'
'libxfont2'
'libpciaccess'
'libxv'
'libxcvt'
'libxmu'
'libxrender'
'libxi'
'libxaw'
'libxtst'
'libxres'
'xorg-xkbcomp'
'xorg-util-macros'
'xorg-font-util'
'libepoxy'
'xcb-util'
'xcb-util-image'
'xcb-util-renderutil'
'xcb-util-wm'
'xcb-util-keysyms'
'libxshmfence'
'libunwind'
'meson'
)
>>>>>>> refs/remotes/origin/master
#------------------------
# INSTALL CONFIGURATION ]
<<<<<<< HEAD
arch=('x86_64')
groups=('xorg')
......@@ -67,22 +137,41 @@ makedepends=(
'libxshmfence'
'libunwind'
'meson')
=======
groups=(
'xorg'
)
backup=(
'etc/X11/Xwrapper.config'
)
>>>>>>> refs/remotes/origin/master
#--------------------
# BUILD PREPARATION ]
prepare() {
<<<<<<< HEAD
cd "${pkgbase}-${pkgver}"
# revert dpi calculation that leads to unwanted miscalculation results
# https://gitlab.freedesktop.org/xorg/xserver/-/issues/1241
# https://bugs.archlinux.org/task/72661
patch -Rp1 -i ../0001_revert_dpi_calculation.patch
=======
cd $pkgbase-$pkgver
## revert dpi calculation that leads to unwanted miscalculation results
## https://gitlab.freedesktop.org/xorg/xserver/-/issues/1241
## https://bugs.archlinux.org/task/72661
patch -Rp1 -i ../0001_revert_dpi_calculation.patch
>>>>>>> refs/remotes/origin/master
}
#----------------
# BUILD CONTROL ]
<<<<<<< HEAD
build() {
# Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
# With them, module fail to load with undefined symbol.
......@@ -162,10 +251,100 @@ package_xorg-server() {
libdrm
libxshmfence # FS#52949
libxcvt)
=======
_flags=(
-Dipv6=true
-Dxvfb=true
-Dxnest=true
-Dxcsecurity=true
-Dxorg=true
-Dxephyr=true
-Dglamor=true
-Dudev=true
-Ddtrace=false
-Dsystemd_logind=false
-Dsuid_wrapper=true
-Dxkb_dir=/usr/share/X11/xkb
-Dxkb_output_dir=/var/lib/xkb
)
#--------
# BUILD ]
build() {
## Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
## With them, module fail to load with undefined symbol.
## See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
export CFLAGS=${CFLAGS/-fno-plt}
export CXXFLAGS=${CXXFLAGS/-fno-plt}
export LDFLAGS=${LDFLAGS/,-z,now}
arch-meson $pkgbase-$pkgver build "${_flags[@]}"
## Print config
meson configure build
ninja -C build
## fake installation to be seperated into packages
DESTDIR="$srcdir/fakeinstall" ninja -C build install
}
#----------
# PACKAGE ]
_install() {
local src f dir
for src; do
f="${src#fakeinstall/}"
dir="${pkgdir}/${f%/*}"
install -m755 -d "${dir}"
## use copy so a new file is created and fakeroot
## can track properties such as setuid.
cp -av "${src}" "${dir}/"
rm -rf "${src}"
done
}
package_xorg-server-common() {
pkgdesc='Xorg server common files'
depends=(
'xkeyboard-config'
'xorg-xkbcomp'
'xorg-setxkbmap'
)
_install fakeinstall/usr/lib/xorg/protocol.txt
_install fakeinstall/usr/share/man/man1/Xserver.1
install -m644 -Dt "$pkgdir/var/lib/xkb/" "$pkgbase-$pkgver"/xkb/README.compiled
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server() {
pkgdesc="Xorg X server"
depends=(
'libepoxy'
'libxfont2'
'pixman'
'xorg-server-common'
'libunwind'
'dbus'
'libgl'
'xf86-input-libinput'
'nettle'
'libpciaccess'
'libdrm'
'libxshmfence'
'libxcvt'
) ## FS#52949
>>>>>>> refs/remotes/origin/master
## see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions.
## we provide major numbers that drivers can depend on
## and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
<<<<<<< HEAD
provides=(
'X-ABI-VIDEODRV_VERSION=25.2'
'X-ABI-XINPUT_VERSION=24.4'
......@@ -278,11 +457,138 @@ package_xorg-server-devel() {
# make sure there are no files left to install
# rm fakeinstall/usr/bin/Xwayland ## no such file
find fakeinstall -depth -print0 | xargs -0 rmdir
=======
provides=(
'X-ABI-VIDEODRV_VERSION=25.2'
'X-ABI-XINPUT_VERSION=24.4'
'X-ABI-EXTENSION_VERSION=10.0'
'x-server'
)
conflicts=(
'nvidia-utils<=331.20'
'glamor-egl'
'xf86-video-modesetting'
)
replaces=(
'glamor-egl'
'xf86-video-modesetting'
)
install=xorg-server.install
_install fakeinstall/usr/bin/{X,Xorg,gtf}
_install fakeinstall/usr/lib/Xorg{,.wrap}
_install fakeinstall/usr/lib/xorg/modules/*
_install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf
_install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1
_install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4
_install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5
## distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -m755 -d "$pkgdir/etc/X11/xorg.conf.d"
## Xwrapper.config
install -Dm0644 Xwrapper.config "$pkgdir"/etc/X11/Xwrapper.config
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xephyr() {
pkgdesc="A nested X server that runs as an X application"
depends=(
'libxfont2'
'libgl'
'libepoxy'
'libunwind'
'libxv'
'pixman'
'xorg-server-common'
'xcb-util-image'
'xcb-util-renderutil'
'xcb-util-wm'
'xcb-util-keysyms'
'nettle'
'libtirpc'
)
_install fakeinstall/usr/bin/Xephyr
_install fakeinstall/usr/share/man/man1/Xephyr.1
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xvfb() {
pkgdesc="Virtual framebuffer X server"
depends=(
'libxfont2'
'libunwind'
'pixman'
'xorg-server-common'
'xorg-xauth'
'libgl'
'nettle'
'libtirpc'
)
_install fakeinstall/usr/bin/Xvfb
_install fakeinstall/usr/share/man/man1/Xvfb.1
install -m755 "$srcdir/xvfb-run" "$pkgdir/usr/bin/"
install -m644 "$srcdir/xvfb-run.1" "$pkgdir/usr/share/man/man1/" ## outda
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-xnest() {
pkgdesc="A nested X server that runs as an X application"
depends=(
'libxfont2'
'libxext'
'pixman'
'xorg-server-common'
'nettle'
'libtirpc'
)
_install fakeinstall/usr/bin/Xnest
_install fakeinstall/usr/share/man/man1/Xnest.1
## license
install -m644 -Dt "$pkgdir/usr/share/licenses/$pkgname" "$pkgbase-$pkgver"/COPYING
}
package_xorg-server-devel() {
pkgdesc="Development files for the X.Org X server"
depends=(
'xorgproto'
'mesa'
'libpciaccess'
'xorg-util-macros'
) ## not technically required but almost every Xorg pkg needs it to build.
_install fakeinstall/usr/include/xorg/*
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
_install fakeinstall/usr/share/aclocal/xorg-server.m4
## license
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
## make sure there are no files left to install
find fakeinstall -depth -print0 | xargs -0 rmdir
>>>>>>> refs/remotes/origin/master
}
#---------------------------
# LICENSE AND VERIFICATION ]
<<<<<<< HEAD
license=('custom')
validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
......@@ -293,3 +599,13 @@ sha512sums=('8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a8
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22' # xvfb-run.1
'97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8' # Xwrapper.config
'28021ef9879d5313096c3e7e79a71a2e15be366652845acf32239d5c011c60aa5938c63c23b04bb0dee56df7b3762b7ca8d51d5925898c67c2ba83ec468fe782') # 0001_revert_dpi_calculation.patch
=======
arch=(x86_64)
license=(custom)
validpgpkeys=(
'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Kanapickas <povilas@radix.lt>
)
sha512sums=(' ')
>>>>>>> refs/remotes/origin/master
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment