rpms/xscreensaver/devel xscreensaver-5.07-gdk-exif-jwz-modified.patch, NONE, 1.1 xscreensaver.spec, 1.77, 1.78

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28541

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.07-gdk-exif-jwz-modified.patch 
Log Message:
* Sat Dec 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-5
- Apply gdk trial patch from jwz (slightly modified)


xscreensaver-5.07-gdk-exif-jwz-modified.patch:

--- NEW FILE xscreensaver-5.07-gdk-exif-jwz-modified.patch ---
--- xscreensaver-5.07/config.h.in.gdk	2008-07-02 02:26:31.000000000 +0900
+++ xscreensaver-5.07/config.h.in	2008-12-27 21:34:50.000000000 +0900
@@ -96,6 +96,10 @@
    can make use of this if it is available. */
 #undef HAVE_GDK_PIXBUF
 
+/* Define this if you have the gdk_pixbuf_apply_embedded_orientation function
+   (gdk-pixbuf 2.12). */
+#undef HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION
+
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
--- xscreensaver-5.07/configure.in.gdk	2008-08-04 02:57:17.000000000 +0900
+++ xscreensaver-5.07/configure.in	2008-12-27 22:41:44.000000000 +0900
@@ -145,6 +145,10 @@
 	    [Define this if you have the GDK_Pixbuf library installed.  Some
 	    of the demos can make use of this if it is available.])
 
+AH_TEMPLATE([HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION],
+	    [Define this if you have the gdk_pixbuf_apply_embedded_orientation
+	    function (gdk-pixbuf 2.12).])
+
 AH_TEMPLATE([HAVE_JPEGLIB],
 	    [Define this if you have the Independent JPEG Group's JPEG
 	    library installed.  Some of the demos can make use of this if it
@@ -3087,6 +3091,12 @@
   else
     AC_MSG_RESULT(checking for gdk_pixbuf usability... no)
   fi
+
+  if test "$have_gdk_pixbuf" = yes; then
+    AC_CHECK_X_LIB(c, gdk_pixbuf_apply_embedded_orientation,
+                     [AC_DEFINE(HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION)],,
+                     $ac_gdk_pixbuf_config_libs -lX11 -lXext -lm)
+  fi
 fi
 
 
--- xscreensaver-5.07/driver/xscreensaver-getimage.c.gdk	2006-09-18 10:03:58.000000000 +0900
+++ xscreensaver-5.07/driver/xscreensaver-getimage.c	2008-12-28 01:58:14.000000000 +0900
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2001-2006 by Jamie Zawinski <jwz at jwz.org>
+/* xscreensaver, Copyright (c) 2001-2008 by Jamie Zawinski <jwz at jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -405,6 +405,20 @@
       int srcx, srcy, destx, desty, w2, h2;
       Bool bg_p = False;
 
+# ifdef HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION
+      {
+        int ow = w, oh = h;
+        GdkPixbuf *opb = pb;
+        pb = gdk_pixbuf_apply_embedded_orientation (opb);
+        gdk_pixbuf_unref (opb);
+        w = gdk_pixbuf_get_width (pb);
+        h = gdk_pixbuf_get_height (pb);
+        if (verbose_p && (w != ow || h != oh))
+          fprintf (stderr, "%s: rotated %dx%d to %dx%d\n",
+                   progname, ow, oh, w, h);
+      }
+# endif
+
       compute_image_scaling (w, h, win_width, win_height, verbose_p,
                              &srcx, &srcy, &destx, &desty, &w2, &h2);
       if (w != w2 || h != h2)


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- xscreensaver.spec	28 Nov 2008 02:12:18 -0000	1.77
+++ xscreensaver.spec	27 Dec 2008 17:39:52 -0000	1.78
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    5
 
 %define extrarel      %{nil}
 
@@ -35,6 +35,7 @@
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
 Patch50:         xscreensaver-5.07-hacks-fix.patch
+Patch100:        xscreensaver-5.07-gdk-exif-jwz-modified.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -188,6 +189,7 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch50 -p1 -b .hacksfix
+%patch100 -p1 -b .gdk
 
 gzip -dc %SOURCE20 > po/ja.po
 
@@ -313,10 +315,10 @@
 sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
 
 %build
-#autoconf
+autoconf
 
 archdir=`./config.guess`
-mkdir $archdir
+[ -d $archdir ] || mkdir $archdir
 cd $archdir
 
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
@@ -331,6 +333,7 @@
 # This is flaky:
 # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
 
+unlink configure || :
 ln -s ../configure .
 %configure $CONFIG_OPTS
 rm -f configure
@@ -633,6 +636,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Dec 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-5
+- Apply gdk trial patch from jwz (slightly modified)
+
 * Fri Nov 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-4
 - Fix fireworkx segfault (bug 473355)