[gnome-libs] Add support for aarch64

Mon Mar 25 14:57:48 UTC 2013

commit f0a6d3b5107e3ee8c62b385303465dd5a73a80b6
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Mar 25 14:56:02 2013 +0000

    Add support for aarch64
    
    - Tweak config.guess and config.sub to add aarch64 support (#925444)
    - If there's no audiofile-config, edit use of it out of gnome-config

 gnome-libs-1.4.2-aarch64-config.patch   |   38 +++++++++++++++++++++++++++++++
 gnome-libs-1.4.2-audiofile-config.patch |   18 ++++++++++++++
 gnome-libs.spec                         |   22 +++++++++++++----
 3 files changed, 73 insertions(+), 5 deletions(-)
---

diff --git a/gnome-libs-1.4.2-aarch64-config.patch b/gnome-libs-1.4.2-aarch64-config.patch
new file mode 100644
index 0000000..ca1e76b
--- /dev/null
+++ b/gnome-libs-1.4.2-aarch64-config.patch
@@ -0,0 +1,38 @@
+Add aarch64 build support (#925444)
+
+--- config.guess
++++ config.guess
+@@ -753,6 +753,13 @@ EOF
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
+     arm*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+--- config.sub
++++ config.sub
+@@ -216,7 +216,8 @@ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+ 	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
+-	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
++		| aarch64 | aarch64_be \
++		| arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
+ 		| pyramid | mn10200 | mn10300 | tron | a29k \
+ 		| 580 | i960 | h8300 \
+ 		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+@@ -260,6 +261,7 @@ case $basic_machine in
+ 	# FIXME: clean up the formatting here.
+ 	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+ 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
++	      | aarch64-* | aarch64_be-* \
+ 	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+ 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+ 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
diff --git a/gnome-libs-1.4.2-audiofile-config.patch b/gnome-libs-1.4.2-audiofile-config.patch
new file mode 100644
index 0000000..4835472
--- /dev/null
+++ b/gnome-libs-1.4.2-audiofile-config.patch
@@ -0,0 +1,18 @@
+Upstream audiofile dropped audiofile-config, so don't try to use it
+
+--- gnome-config.in
++++ gnome-config.in
+@@ -189,11 +189,11 @@ while test $# -gt 0; do
+ 	the_flags="$the_flags `gtk-config --cflags`"
+ 	;;
+     gnome)
+-       	the_libs="$the_libs @GNOME_LIBDIR@ -lgnome -lgnomesupport `esd-config --libs` `audiofile-config --libs` `glib-config --libs`"
++       	the_libs="$the_libs @GNOME_LIBDIR@ -lgnome -lgnomesupport `esd-config --libs` `pkg-config --libs audiofile` `glib-config --libs`"
+   	the_flags="$the_flags @GNOME_INCLUDEDIR@ `gtk-config --cflags`"
+ 	;;
+     gnomeui)
+-	the_libs="$the_libs @GNOME_LIBDIR@ -lgnomeui -lart_lgpl `imlib-config --libs-gdk` -lSM -lICE `gtk-config --libs` -lgnome -lgnomesupport `esd-config --libs` `audiofile-config --libs` `glib-config --libs`"
++	the_libs="$the_libs @GNOME_LIBDIR@ -lgnomeui -lart_lgpl `imlib-config --libs-gdk` -lSM -lICE `gtk-config --libs` -lgnome -lgnomesupport `esd-config --libs` `pkg-config --libs audiofile` `glib-config --libs`"
+ 	the_flags="$the_flags @GNOME_INCLUDEDIR@ `gtk-config --cflags`"
+ 	;;
+     gtkxmhtml)
diff --git a/gnome-libs.spec b/gnome-libs.spec
index d74b7bb..d76f261 100644
--- a/gnome-libs.spec
+++ b/gnome-libs.spec
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPLv2+ and BSD with advertising and (LGPLv2+ and BSD with advertising)
 Group:          System Environment/Libraries
@@ -79,6 +79,8 @@ Patch106:       gnome-libs-1.4.2-norecurse.patch
 Patch107:       gnome-libs-1.4.2-gnome-config-no-Llibdir.patch
 Patch108:       gnome-libs-1.4.2-cleanlibs.patch
 Patch109:       gnome-libs-1.4.2-ppc64-config.patch
+Patch110:       gnome-libs-1.4.2-aarch64-config.patch
+Patch111:       gnome-libs-1.4.2-audiofile-config.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -169,6 +171,12 @@ cd -
 %patch107 -p1 -b .nolibdir
 %patch108 -p1 -b .cleanlibs
 %patch109 -p1 -b .ppc64-config
+%patch110 -p0 -b .aarch64-config
+
+# If there's no audiofile-config, edit use of it out of gnome-config
+%if %([ -x /usr/bin/audiofile-config ] && echo 0 || echo 1)
+%patch111
+%endif
 
 iconv -f iso-8859-1 -t utf-8 < ChangeLog > ChangeLog.utf-8
 mv -f ChangeLog.utf-8 ChangeLog
@@ -341,11 +349,15 @@ rm -rf %{buildroot}
 %{_libdir}/libgnomeui.so
 
 %changelog
+* Mon Mar 25 2013 Paul Howarth <paul at city-fan.org> - 1:1.4.2-25
+- Tweak config.guess and config.sub to add aarch64 support (#925444)
+- If there's no audiofile-config, edit use of it out of gnome-config
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.2-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 1:1.4.2-23
-- rebuild due to "jpeg8-ABI" feature drop
+- Rebuild due to "jpeg8-ABI" feature drop
 
 * Thu Oct 11 2012 Paul Howarth <paul at city-fan.org> 1:1.4.2-22
 - Rebuild for libaudiofile.so.1
@@ -395,7 +407,7 @@ rm -rf %{buildroot}
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.4.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Nov 20 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-11
+* Thu Nov 20 2008 Paul Howarth <paul at city-fan.org> 1:1.4.2-11
 - Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
   (where available)
 - BerkeleyDB source moved to download.oracle.com
@@ -773,7 +785,7 @@ gnome-libs. I am the true survivor!
 - Rebuild to see if we can fix funny gnome-config junk
   problem. 
 
-* Tue Jul 19 2000 Havoc Pennington <hp at redhat.com>
+* Wed Jul 19 2000 Havoc Pennington <hp at redhat.com>
 - Rebuild; were getting weird segfaults with tearoff dock items,
   rebuilding with debugging made it go away, hoping it was 
   a compiler bug.
@@ -820,7 +832,7 @@ gnome-libs. I am the true survivor!
 * Fri Feb 04 2000 Elliot Lee <sopwith at redhat.com>
 - Accept true/yes/non-zero as TRUE for gnome-config boolean values.
 
-* Wed Feb 03 2000 Havoc Pennington <hp at redhat.com>
+* Thu Feb 03 2000 Havoc Pennington <hp at redhat.com>
 - set ECHOK for terminal widget, bug 8823
 
 * Wed Feb 02 2000 Havoc Pennington <hp at redhat.com>
