3353bf4722
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
Remove some checks that break cross.
|
|
|
|
--- a/configure.ac 2019-04-30 17:00:37.796389608 +0200
|
|
+++ b/configure.ac 2019-04-30 17:01:44.933049215 +0200
|
|
@@ -63,37 +63,14 @@
|
|
[EXA="$enableval"],
|
|
[EXA=yes])
|
|
|
|
-# Store the list of server defined optional extensions in REQUIRED_MODULES
|
|
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
|
|
-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
|
|
-XORG_DRIVER_CHECK_EXT(XV, videoproto)
|
|
-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
|
|
-
|
|
# Obtain compiler/linker options for the driver dependencies
|
|
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.1.0 xproto fontsproto $REQUIRED_MODULES])
|
|
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.1.0 xproto fontsproto randrproto renderproto videoproto xextproto])
|
|
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
|
|
|
|
# Checks for libraries.
|
|
|
|
-if test "x$DRI" != xno; then
|
|
- AC_CHECK_FILE([${sdkdir}/dri.h],
|
|
- [have_dri_h="yes"], [have_dri_h="no"])
|
|
- AC_CHECK_FILE([${sdkdir}/sarea.h],
|
|
- [have_sarea_h="yes"], [have_sarea_h="no"])
|
|
- AC_CHECK_FILE([${sdkdir}/dristruct.h],
|
|
- [have_dristruct_h="yes"], [have_dristruct_h="no"])
|
|
-fi
|
|
-
|
|
AC_MSG_CHECKING([whether to include DRI support])
|
|
-if test "x$DRI" = xauto; then
|
|
- if test "x$have_dri_h" = xyes && \
|
|
- test "x$have_sarea_h" = xyes && \
|
|
- test "x$have_dristruct_h" = xyes; then
|
|
- DRI="yes"
|
|
- else
|
|
- DRI="no"
|
|
- fi
|
|
-fi
|
|
+DRI="no"
|
|
AC_MSG_RESULT([$DRI])
|
|
|
|
AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
|