libx11,diet-x11: oe-stylize

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

17 files changed, 61 insertions, 63 deletions

diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
index 3d8fe05b1b..593ba34c6b 100644
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.1.bb
@@ -1,11 +1,12 @@
 require libx11_${PV}.bb
-
-EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://X18NCMSstubs.diff \
-	    file://fix-disable-xlocale.diff \
+            file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch \
-	    file://xim.patch \
-	    file://xchar2b.patch"
-PR = "${INC_PR}.0"
+            file://xim.patch \
+            file://xchar2b.patch"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
index 8aefbc7da7..f6291a93d1 100644
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.2.bb
@@ -1,10 +1,10 @@
 require libx11_${PV}.bb
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://X18NCMSstubs.diff \
-	    file://fix-disable-xlocale.diff \
+            file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-PR = "${INC_PR}.0"
 
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
index 853d794ce4..f6291a93d1 100644
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.3.bb
@@ -1,9 +1,10 @@
 require libx11_${PV}.bb
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://X18NCMSstubs.diff \
-	    file://fix-disable-xlocale.diff \
+            file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
index d0f0608e66..f6291a93d1 100644
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.4.bb
@@ -1,9 +1,10 @@
 require libx11_${PV}.bb
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/diet-x11_1.1.5.bb b/recipes/xorg-lib/diet-x11_1.1.5.bb
index d0f0608e66..f6291a93d1 100644
--- a/recipes/xorg-lib/diet-x11_1.1.5.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.5.bb
@@ -1,9 +1,10 @@
 require libx11_${PV}.bb
-
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
-CFLAGS += "-D_GNU_SOURCE"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
-PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+
+CFLAGS += "-D_GNU_SOURCE"
diff --git a/recipes/xorg-lib/libx11_1.0.1.bb b/recipes/xorg-lib/libx11_1.0.1.bb
index 2238a8c436..734a31d028 100644
--- a/recipes/xorg-lib/libx11_1.0.1.bb
+++ b/recipes/xorg-lib/libx11_1.0.1.bb
@@ -1,11 +1,10 @@
 require libx11.inc
 LICENSE = "XFree86"
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://ruutf8.patch"
-
 SRC_URI[archive.md5sum] = "58f0537f21183e27149cf906a1b6bef9"
 SRC_URI[archive.sha256sum] = "f99e4ce6d8e3b8833957978fe22223897b0e636c83580f2b07eff0388eb75294"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.0.3.bb b/recipes/xorg-lib/libx11_1.0.3.bb
index 73c7f7f61f..40cbeb5b48 100644
--- a/recipes/xorg-lib/libx11_1.0.3.bb
+++ b/recipes/xorg-lib/libx11_1.0.3.bb
@@ -1,11 +1,10 @@
 require libx11.inc
 LICENSE = "XFree86"
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://ruutf8.patch"
-
 SRC_URI[archive.md5sum] = "60b787a812c92d33f71860e4e19cb59d"
 SRC_URI[archive.sha256sum] = "fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
index 1292f6c4e1..368dd7b0fa 100644
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ b/recipes/xorg-lib/libx11_1.1.1.bb
@@ -1,10 +1,9 @@
 require libx11.inc
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://ruutf8.patch"
-
 SRC_URI[archive.md5sum] = "848b80f77b20ae1fa5c882bbfa531ebc"
 SRC_URI[archive.sha256sum] = "5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
index 39dc20c83c..60093c1b6d 100644
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ b/recipes/xorg-lib/libx11_1.1.2.bb
@@ -1,8 +1,8 @@
 require libx11.inc
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI[archive.md5sum] = "710bf38a9477a5a1b235bc94f1d0593c"
 SRC_URI[archive.sha256sum] = "b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
index b052c77dd6..d6aa199e7f 100644
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ b/recipes/xorg-lib/libx11_1.1.3.bb
@@ -1,8 +1,8 @@
 require libx11.inc
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c"
 SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
index eb3283ec37..3eeeece52c 100644
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ b/recipes/xorg-lib/libx11_1.1.4.bb
@@ -1,8 +1,8 @@
 require libx11.inc
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3"
 SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb
index e3b46cf678..cd902feda3 100644
--- a/recipes/xorg-lib/libx11_1.1.5.bb
+++ b/recipes/xorg-lib/libx11_1.1.5.bb
@@ -1,8 +1,8 @@
 require libx11.inc
-PR = "${INC_PR}.0"
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8"
 SRC_URI[archive.sha256sum] = "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
index 042a135e96..0cea5f884c 100644
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ b/recipes/xorg-lib/libx11_1.2.bb
@@ -1,10 +1,9 @@
 require libx11.inc
-
 DEPENDS = "${COMMON_DEPENDS}"
-EXTRA_OECONF += " --without-xcb"
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://dolt-fix.patch"
-
 SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
 SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"
-PR = "${INC_PR}.0"
+
+EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index 9f35866f8e..8d8611f255 100644
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -1,7 +1,6 @@
 require libx11.inc
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://dolt-fix.patch"
-
 SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd"
 SRC_URI[archive.sha256sum] = "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index be9e749210..8c40a99fd9 100644
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -1,7 +1,6 @@
 require libx11.inc
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://dolt-fix.patch"
-
 SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
 SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_1.3.4.bb b/recipes/xorg-lib/libx11_1.3.4.bb
index c20a9af4e6..e55d7201ad 100644
--- a/recipes/xorg-lib/libx11_1.3.4.bb
+++ b/recipes/xorg-lib/libx11_1.3.4.bb
@@ -1,7 +1,6 @@
 require libx11.inc
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://dolt-fix.patch"
-
 SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
 SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
-PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb
index 4ae066f1c8..eac68d8ff4 100644
--- a/recipes/xorg-lib/libx11_git.bb
+++ b/recipes/xorg-lib/libx11_git.bb
@@ -1,13 +1,14 @@
 require libx11.inc
-
-DEFAULT_PREFERENCE = "-1"
 PV = "1.3.3+git"
-SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
+PR = "${INC_PR}.0"
+
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
 SRC_URI += " file://keysymdef_include.patch \
              file://x11_disable_makekeys.patch \
              file://dolt-fix.patch \
 "
 
+SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d"
 S = "${WORKDIR}/git"
-PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"