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
```
21 lines
505 B
Diff
21 lines
505 B
Diff
--- a/src/fbdev.c
|
|
+++ b/src/fbdev.c
|
|
@@ -1037,7 +1037,7 @@
|
|
fPtr->CloseScreen = pScreen->CloseScreen;
|
|
pScreen->CloseScreen = FBDevCloseScreen;
|
|
|
|
-#if XV
|
|
+#ifdef XV
|
|
fPtr->SunxiVideo_private = NULL;
|
|
if (xf86ReturnOptValBool(fPtr->Options, OPTION_XV_OVERLAY, TRUE) &&
|
|
fPtr->sunxi_disp_private) {
|
|
@@ -1126,7 +1126,7 @@
|
|
fPtr->SunxiDispHardwareCursor_private = NULL;
|
|
}
|
|
|
|
-#if XV
|
|
+#ifdef XV
|
|
if (fPtr->SunxiVideo_private) {
|
|
SunxiVideo_Close(pScreen);
|
|
free(fPtr->SunxiVideo_private);
|