rpms/gimp/devel gimp-2.2.7-cpuinstructionset.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3432

Modified Files:
	gimp-2.2.7-cpuinstructionset.patch 
Log Message:
fix cpuinstructionset patch


gimp-2.2.7-cpuinstructionset.patch:
 app/composite/Makefile.am |  125 ++++++++++++++++++++++++++++++++++++----------
 configure.in              |   23 ++++++++
 2 files changed, 122 insertions(+), 26 deletions(-)

Index: gimp-2.2.7-cpuinstructionset.patch
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp-2.2.7-cpuinstructionset.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gimp-2.2.7-cpuinstructionset.patch	11 May 2005 15:14:36 -0000	1.1
+++ gimp-2.2.7-cpuinstructionset.patch	11 May 2005 15:29:17 -0000	1.2
@@ -1,11 +1,11 @@
 --- gimp-2.2.7/app/composite/Makefile.am.cpuinstructionset	2004-07-20 18:33:58.000000000 +0200
-+++ gimp-2.2.7/app/composite/Makefile.am	2005-05-11 15:24:42.000000000 +0200
-@@ -18,40 +18,101 @@
++++ gimp-2.2.7/app/composite/Makefile.am	2005-05-11 16:45:52.000000000 +0200
+@@ -18,40 +18,113 @@
  	$(GLIB_CFLAGS)		\
  	-I$(includedir)
  
 -noinst_LIBRARIES = libappcomposite.a
-+noinst_LIBRARIES = libappcomposite.a $(libappcomposite_a_LDADD)
++noinst_LIBRARIES = libappcomposite.a $(libappcomposite_a_LIBADD)
  
 -libappcomposite_a_sources = \
 -	gimp-composite-3dnow.c		\
@@ -36,17 +36,18 @@
 -	gimp-composite-sse-installer.c		\
 -	gimp-composite-sse2-installer.c		\
 -	gimp-composite-vis-installer.c
-+libappcomposite_a_LDADD = \
+-
+-libappcomposite_a_SOURCES = \
+-	$(libappcomposite_a_built_sources)	\
+-	$(libappcomposite_a_sources)
++libappcomposite_a_LIBADD = \
 +	libappcomposite_3dnow.a \
 +	libappcomposite_altivec.a \
 +	libappcomposite_mmx.a \
 +	libappcomposite_sse.a \
 +	libappcomposite_sse2.a \
 +	libappcomposite_vis.a
- 
--libappcomposite_a_SOURCES = \
--	$(libappcomposite_a_built_sources)	\
--	$(libappcomposite_a_sources)
++
 +libappcomposite_3dnow_a_sources = \
 +    gimp-composite-3dnow.c \
 +    gimp-composite-3dnow.h
@@ -58,7 +59,9 @@
 +    $(libappcomposite_3dnow_a_sources) \
 +    $(libappcomposite_3dnow_a_built_sources)
 +
++if CAN_3DNOW
 +libappcomposite_3dnow_a_CFLAGS = -m3dnow
++endif
 +
 +libappcomposite_altivec_a_sources = \
 +    gimp-composite-altivec.c \
@@ -71,7 +74,9 @@
 +    $(libappcomposite_altivec_a_sources) \
 +    $(libappcomposite_altivec_a_built_sources)
 +
++if CAN_ALTIVEC
 +libappcomposite_altivec_a_CFLAGS = -maltivec
++endif
 +
 +libappcomposite_mmx_a_sources = \
 +    gimp-composite-mmx.c \
@@ -84,7 +89,9 @@
 +    $(libappcomposite_mmx_a_sources) \
 +    $(libappcomposite_mmx_a_built_sources)
 +
++if CAN_MMX
 +libappcomposite_mmx_a_CFLAGS = -mmmx
++endif
 +
 +libappcomposite_sse_a_sources = \
 +    gimp-composite-sse.c \
@@ -97,7 +104,9 @@
 +    $(libappcomposite_sse_a_sources) \
 +    $(libappcomposite_sse_a_built_sources)
 +
++if CAN_SSE
 +libappcomposite_sse_a_CFLAGS = -msse
++endif
 +
 +libappcomposite_sse2_a_sources = \
 +    gimp-composite-sse2.c \
@@ -110,7 +119,9 @@
 +    $(libappcomposite_sse2_a_sources) \
 +    $(libappcomposite_sse2_a_built_sources)
 +
++if CAN_SSE
 +libappcomposite_sse2_a_CFLAGS = -msse2
++endif
 +
 +libappcomposite_vis_a_sources = \
 +    gimp-composite-vis.c \
@@ -123,7 +134,48 @@
 +    $(libappcomposite_vis_a_sources) \
 +    $(libappcomposite_vis_a_built_sources)
 +
++if CAN_VIS
 +libappcomposite_vis_a_CFLAGS = -mvis
++endif
  
  regenerate: gimp-composite-generic.o gimp-composite-mmx.o gimp-composite-sse.o gimp-composite-sse2.o gimp-composite-3dnow.o gimp-composite-altivec.o gimp-composite-vis.o
  	$(srcdir)/make-installer.py                                          -f gimp-composite-generic.o
+--- gimp-2.2.7/configure.in.cpuinstructionset	2005-04-11 11:42:07.000000000 +0200
++++ gimp-2.2.7/configure.in	2005-05-11 16:55:32.000000000 +0200
+@@ -603,6 +603,12 @@
+ 
+ fi
+ 
++# FIXME: make test for 3dnow when it's implemented
++enable_3dnow=no
++
++AM_CONDITIONAL(CAN_MMX, test "x$enable_mmx" = xyes)
++AM_CONDITIONAL(CAN_SSE, test "x$enable_sse" = xyes)
++AM_CONDITIONAL(CAN_3DNOW, test "x$enable_3dnow" = xyes)
+ 
+ ############################
+ # Check for Altivec assembly
+@@ -627,6 +633,23 @@
+ 
+ fi
+ 
++AM_CONDITIONAL(CAN_ALTIVEC, test "x$enable_altivec" = xyes)
++
++############################
++# Check for Altivec assembly
++############################
++
++## FIX ME
++case "$target_or_host" in
++*sparc*)
++    enable_vis=yes
++    ;;
++*)
++    enable_vis=no
++    ;;
++esac
++
++AM_CONDITIONAL(CAN_VIS, test "x$enable_vis" = xyes)
+ 
+ ###################################
+ # Checks for shared memory handling