Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: rename patches to the new convention

PATCH New Bernd Kuhls 3 participants 5 messages Nov 29, 2014 – Dec 8, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/x11r7/xserver_xorg-server: rename patches to the new convention

Patch 0003 will be extended to fix the blackfin build as well, therefore it is renamed according to the fixed variable.

---
 ...atch => 0001-os-log-adjust-gcc-version-conditions-for-pragma.patch} |    0
 ...r_xorg-server-0002-glyphpadbytes.patch => 0002-glyphpadbytes.patch} |    0
 ...r_xorg-server-0003-microblaze.patch => 0003-image-byte-order.patch} |    0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename package/x11r7/xserver_xorg-server/{xserver_xorg-server-0001-os-log-adjust-gcc-version-conditions-for-pragma.patch => 0001-os-log-adjust-gcc-version-conditions-for-pragma.patch} (100%)
 rename package/x11r7/xserver_xorg-server/{xserver_xorg-server-0002-glyphpadbytes.patch => 0002-glyphpadbytes.patch} (100%)
 rename package/x11r7/xserver_xorg-server/{xserver_xorg-server-0003-microblaze.patch => 0003-image-byte-order.patch} (100%)
package/x11r7/xserver_xorg-server/0001-os-log-adjust-gcc-version-conditions-for-pragma.patch renamed from package/x11r7/xserver_xorg-server/xserver_xorg-server-0001-os-log-adjust-gcc-version-conditions-for-pragma.patch +0 -0
similarity index 100%
rename from package/x11r7/xserver_xorg-server/xserver_xorg-server-0001-os-log-adjust-gcc-version-conditions-for-pragma.patch
rename to package/x11r7/xserver_xorg-server/0001-os-log-adjust-gcc-version-conditions-for-pragma.patch
package/x11r7/xserver_xorg-server/0002-glyphpadbytes.patch renamed from package/x11r7/xserver_xorg-server/xserver_xorg-server-0002-glyphpadbytes.patch +0 -0
similarity index 100%
rename from package/x11r7/xserver_xorg-server/xserver_xorg-server-0002-glyphpadbytes.patch
rename to package/x11r7/xserver_xorg-server/0002-glyphpadbytes.patch
package/x11r7/xserver_xorg-server/0003-image-byte-order.patch renamed from package/x11r7/xserver_xorg-server/xserver_xorg-server-0003-microblaze.patch +0 -0
similarity index 100%
rename from package/x11r7/xserver_xorg-server/xserver_xorg-server-0003-microblaze.patch
rename to package/x11r7/xserver_xorg-server/0003-image-byte-order.patch
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 package/x11r7/xserver_xorg-server: Fix blackfin build

Fixes
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/

Upstream bug report was updated:
https://bugs.freedesktop.org/show_bug.cgi?id=83582

---
 package/x11r7/xserver_xorg-server/0003-image-byte-order.patch |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xserver_xorg-server/0003-image-byte-order.patch +2 -2
index b99b669..59e8177 100644
@@ -1,4 +1,4 @@
-xserver_xorg-server: Fix compile error for microblaze
+xserver_xorg-server: Fix compile error for microblaze/blackfin
 
 Fixes
 mipushpxl.c: In function 'miPushPixels':
@@ -16,7 +16,7 @@ diff -uNr xorg-server-1.16.0.glyph/include/servermd.h xorg-server-1.16.0/include
  
  #endif                          /* mips */
  
-+#if defined(__microblaze__) || defined(microblaze)
++#if defined(__microblaze__) || defined(microblaze) || defined(BFIN)
 +
 +#ifdef __BIG_ENDIAN__
 +#define IMAGE_BYTE_ORDER	MSBFirst
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 package/x11r7/xserver_xorg-server: Fix blackfin build

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Fixes
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/

These are all the same URL?

Quoted 19 lines

Upstream bug report was updated:
https://bugs.freedesktop.org/show_bug.cgi?id=83582

---
 package/x11r7/xserver_xorg-server/0003-image-byte-order.patch |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/x11r7/xserver_xorg-server/0003-image-byte-order.patch +1 -1
index b99b669..59e8177 100644
@@ -1,4 +1,4 @@
-xserver_xorg-server: Fix compile error for microblaze
+xserver_xorg-server: Fix compile error for microblaze/blackfin
 
 Fixes
 mipushpxl.c: In function 'miPushPixels':

package/x11r7/xserver_xorg-server/0003-image-byte-order.patch diff -uNr xorg-server-1.16.0.glyph/include/servermd.h xorg-server-1.16.0/include · line 19

Quoted 5 lines
package/x11r7/xserver_xorg-server/0003-image-byte-order.patch +1 -1
@@ -16,7 +16,7 @@ diff -uNr xorg-server-1.16.0.glyph/include/servermd.h xorg-server-1.16.0/include
 
  #endif                          /* mips */
 
-+#if defined(__microblaze__) || defined(microblaze)
++#if defined(__microblaze__) || defined(microblaze) || defined(BFIN)

But xserver_xorg-server depends on !BR2_USE_MMU since 7c00cd:

xorg-server: needs mmu

os/utils.c::System() unconditionally uses fork(), so it only builds on configurations with mmu.

(Indirectly) fixes:
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/d27/d279dc35bff53b7f939af02bee70b1ed3014e49b/
http://autobuild.buildroot.net/results/84b/84b8f19221a5c841de3016959c99b92c96c57e81/

Which even lists the same autobuilder issue you listed about. So what is the point?

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/x11r7/xserver_xorg-server: Fix blackfin build

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 9 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/
http://autobuild.buildroot.net/results/497/4970352598a68d7af89acbb33cdf69d656e23f4d/

Upstream bug report was updated:
https://bugs.freedesktop.org/show_bug.cgi?id=83582

Seeing the comments made by Peter on your patch, I've marked it as 'Rejected' in patchwork. Please resend an updated version if you think there is nonetheless something to be fixed.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/2 package/x11r7/xserver_xorg-server: rename patches to the new convention

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls

Patch 0003 will be extended to fix the blackfin build as well, therefore it is renamed according to the fixed variable.

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com