rpms/gimp/devel gimp-2.2.7-cpuinstructionset.patch,1.2,1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 12 12:21:22 UTC 2005
Author: nphilipp
Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv872
Modified Files:
gimp-2.2.7-cpuinstructionset.patch
Log Message:
fix cpuinstructionset patch more
gimp-2.2.7-cpuinstructionset.patch:
app/composite/Makefile.am | 128 +++++++++++++++++++++++++++++++++++++---------
configure.in | 23 ++++++++
2 files changed, 126 insertions(+), 25 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gimp-2.2.7-cpuinstructionset.patch 11 May 2005 15:29:17 -0000 1.2
+++ gimp-2.2.7-cpuinstructionset.patch 12 May 2005 12:21:19 -0000 1.3
@@ -1,18 +1,21 @@
---- 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 16:45:52.000000000 +0200
-@@ -18,40 +18,113 @@
+--- gimp-2.2.7/app/composite/Makefile.am.cpuinstructionset 2004-07-20 12:33:58.000000000 -0400
++++ gimp-2.2.7/app/composite/Makefile.am 2005-05-12 08:15:33.000000000 -0400
+@@ -18,40 +18,118 @@
$(GLIB_CFLAGS) \
-I$(includedir)
--noinst_LIBRARIES = libappcomposite.a
-+noinst_LIBRARIES = libappcomposite.a $(libappcomposite_a_LIBADD)
++noinst_LTLIBRARIES = libappcomposite.la $(libappcomposite_la_LIBADD)
+ noinst_LIBRARIES = libappcomposite.a
-libappcomposite_a_sources = \
- gimp-composite-3dnow.c \
- gimp-composite-3dnow.h \
- gimp-composite-altivec.c \
- gimp-composite-altivec.h \
-+libappcomposite_a_SOURCES = \
++libappcomposite.a: libappcomposite.la
++ cp -f .libs/$@ $@
++
++libappcomposite_la_SOURCES = \
gimp-composite-generic.c \
gimp-composite-generic.h \
- gimp-composite-mmx.c \
@@ -21,6 +24,7 @@
- gimp-composite-sse.h \
- gimp-composite-sse2.c \
- gimp-composite-sse2.h \
++ gimp-composite-generic-installer.c \
gimp-composite-util.h \
- gimp-composite-vis.c \
- gimp-composite-vis.h \
@@ -40,108 +44,108 @@
-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_la_LIBADD = \
++ libappcomposite_3dnow.la \
++ libappcomposite_altivec.la \
++ libappcomposite_mmx.la \
++ libappcomposite_sse.la \
++ libappcomposite_sse2.la \
++ libappcomposite_vis.la
+
-+libappcomposite_3dnow_a_sources = \
++libappcomposite_3dnow_la_sources = \
+ gimp-composite-3dnow.c \
+ gimp-composite-3dnow.h
+
-+libappcomposite_3dnow_a_built_sources = \
++libappcomposite_3dnow_la_built_sources = \
+ gimp-composite-3dnow-installer.c
+
-+libappcomposite_3dnow_a_SOURCES = \
-+ $(libappcomposite_3dnow_a_sources) \
-+ $(libappcomposite_3dnow_a_built_sources)
++libappcomposite_3dnow_la_SOURCES = \
++ $(libappcomposite_3dnow_la_sources) \
++ $(libappcomposite_3dnow_la_built_sources)
+
+if CAN_3DNOW
-+libappcomposite_3dnow_a_CFLAGS = -m3dnow
++libappcomposite_3dnow_la_CFLAGS = -m3dnow
+endif
+
-+libappcomposite_altivec_a_sources = \
++libappcomposite_altivec_la_sources = \
+ gimp-composite-altivec.c \
+ gimp-composite-altivec.h
+
-+libappcomposite_altivec_a_built_sources = \
++libappcomposite_altivec_la_built_sources = \
+ gimp-composite-altivec-installer.c
+
-+libappcomposite_altivec_a_SOURCES = \
-+ $(libappcomposite_altivec_a_sources) \
-+ $(libappcomposite_altivec_a_built_sources)
++libappcomposite_altivec_la_SOURCES = \
++ $(libappcomposite_altivec_la_sources) \
++ $(libappcomposite_altivec_la_built_sources)
+
+if CAN_ALTIVEC
-+libappcomposite_altivec_a_CFLAGS = -maltivec
++libappcomposite_altivec_la_CFLAGS = -maltivec
+endif
+
-+libappcomposite_mmx_a_sources = \
++libappcomposite_mmx_la_sources = \
+ gimp-composite-mmx.c \
+ gimp-composite-mmx.h
+
-+libappcomposite_mmx_a_built_sources = \
++libappcomposite_mmx_la_built_sources = \
+ gimp-composite-mmx-installer.c
+
-+libappcomposite_mmx_a_SOURCES = \
-+ $(libappcomposite_mmx_a_sources) \
-+ $(libappcomposite_mmx_a_built_sources)
++libappcomposite_mmx_la_SOURCES = \
++ $(libappcomposite_mmx_la_sources) \
++ $(libappcomposite_mmx_la_built_sources)
+
+if CAN_MMX
-+libappcomposite_mmx_a_CFLAGS = -mmmx
++libappcomposite_mmx_la_CFLAGS = -mmmx
+endif
+
-+libappcomposite_sse_a_sources = \
++libappcomposite_sse_la_sources = \
+ gimp-composite-sse.c \
+ gimp-composite-sse.h
+
-+libappcomposite_sse_a_built_sources = \
++libappcomposite_sse_la_built_sources = \
+ gimp-composite-sse-installer.c
+
-+libappcomposite_sse_a_SOURCES = \
-+ $(libappcomposite_sse_a_sources) \
-+ $(libappcomposite_sse_a_built_sources)
++libappcomposite_sse_la_SOURCES = \
++ $(libappcomposite_sse_la_sources) \
++ $(libappcomposite_sse_la_built_sources)
+
+if CAN_SSE
-+libappcomposite_sse_a_CFLAGS = -msse
++libappcomposite_sse_la_CFLAGS = -msse
+endif
+
-+libappcomposite_sse2_a_sources = \
++libappcomposite_sse2_la_sources = \
+ gimp-composite-sse2.c \
+ gimp-composite-sse2.h
+
-+libappcomposite_sse2_a_built_sources = \
++libappcomposite_sse2_la_built_sources = \
+ gimp-composite-sse2-installer.c
+
-+libappcomposite_sse2_a_SOURCES = \
-+ $(libappcomposite_sse2_a_sources) \
-+ $(libappcomposite_sse2_a_built_sources)
++libappcomposite_sse2_la_SOURCES = \
++ $(libappcomposite_sse2_la_sources) \
++ $(libappcomposite_sse2_la_built_sources)
+
+if CAN_SSE
-+libappcomposite_sse2_a_CFLAGS = -msse2
++libappcomposite_sse2_la_CFLAGS = -msse2
+endif
+
-+libappcomposite_vis_a_sources = \
++libappcomposite_vis_la_sources = \
+ gimp-composite-vis.c \
+ gimp-composite-vis.h
+
-+libappcomposite_vis_a_built_sources = \
++libappcomposite_vis_la_built_sources = \
+ gimp-composite-vis-installer.c
+
-+libappcomposite_vis_a_SOURCES = \
-+ $(libappcomposite_vis_a_sources) \
-+ $(libappcomposite_vis_a_built_sources)
++libappcomposite_vis_la_SOURCES = \
++ $(libappcomposite_vis_la_sources) \
++ $(libappcomposite_vis_la_built_sources)
+
+if CAN_VIS
-+libappcomposite_vis_a_CFLAGS = -mvis
++libappcomposite_vis_la_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
+--- gimp-2.2.7/configure.in.cpuinstructionset 2005-04-11 05:42:07.000000000 -0400
++++ gimp-2.2.7/configure.in 2005-05-12 06:54:54.000000000 -0400
@@ -603,6 +603,12 @@
fi
More information about the fedora-cvs-commits
mailing list