File project.diff of Package xscreensaver

--- xscreensaver-default-screensaver.patch.orig
+++ xscreensaver-default-screensaver.patch
@@ -1,7 +1,8 @@
-diff -uNr old-xscreensaver-5.20/driver/XScreenSaver_ad.h xscreensaver-5.20/driver/XScreenSaver_ad.h
---- old-xscreensaver-5.20/driver/XScreenSaver_ad.h	2012-10-06 22:20:04.000000000 +0200
-+++ xscreensaver-5.20/driver/XScreenSaver_ad.h	2012-12-26 05:39:10.446124543 +0100
-@@ -1,35 +1,36 @@
+Index: xscreensaver-5.22/driver/XScreenSaver_ad.h
+===================================================================
+--- xscreensaver-5.22.orig/driver/XScreenSaver_ad.h
++++ xscreensaver-5.22/driver/XScreenSaver_ad.h
+@@ -1,36 +1,37 @@
  "#error Do not run app-defaults files through xrdb!",
  "#error That does not do what you might expect.",
  "#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.",
@@ -50,7 +51,9 @@ diff -uNr old-xscreensaver-5.20/driver/X
  "*textLiteral:		XScreenSaver",
  "*textFile:		",
  "*textProgram:		fortune",
-@@ -195,7 +196,7 @@
+ "*textURL:		http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss",
+@@ -194,9 +195,9 @@
+ 				fontglide -root				    \\n\
    GL: 				gleidescope -root			    \\n\
    GL: 				glknots -root				    \\n\
    GL: 				glmatrix -root				    \\n\
@@ -59,10 +62,13 @@ diff -uNr old-xscreensaver-5.20/driver/X
    GL: 				hypertorus -root			    \\n\
  - GL: 				jigglypuff -root			    \\n\
  				metaballs -root				    \\n\
-diff -uNr old-xscreensaver-5.20/driver/XScreenSaver.ad.in xscreensaver-5.20/driver/XScreenSaver.ad.in
---- old-xscreensaver-5.20/driver/XScreenSaver.ad.in	2012-10-06 22:04:17.000000000 +0200
-+++ xscreensaver-5.20/driver/XScreenSaver.ad.in	2012-12-26 05:39:10.446124543 +0100
-@@ -28,37 +28,37 @@
+   GL: 				mirrorblob -root			    \\n\
+Index: xscreensaver-5.22/driver/XScreenSaver.ad.in
+===================================================================
+--- xscreensaver-5.22.orig/driver/XScreenSaver.ad.in
++++ xscreensaver-5.22/driver/XScreenSaver.ad.in
+@@ -27,39 +27,39 @@
+ #error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.
  
  ! /* (xrdb prevention kludge: whole file)
  
@@ -109,7 +115,9 @@ diff -uNr old-xscreensaver-5.20/driver/X
  *textLiteral:		XScreenSaver
  *textFile:		@DEFAULT_TEXT_FILE@
  *textProgram:		fortune
-@@ -300,7 +300,7 @@
+ *textURL:		http://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
+@@ -298,9 +298,9 @@ GetViewPortIsFullOfLies: False
+ 				fontglide -root				    \n\
  @GL_KLUDGE@ GL: 				gleidescope -root			    \n\
  @GL_KLUDGE@ GL: 				glknots -root				    \n\
  @GL_KLUDGE@ GL: 				glmatrix -root				    \n\
@@ -118,3 +126,4 @@ diff -uNr old-xscreensaver-5.20/driver/X
  @GL_KLUDGE@ GL: 				hypertorus -root			    \n\
  - GL: 				jigglypuff -root			    \n\
  				metaballs -root				    \n\
+ @GL_KLUDGE@ GL: 				mirrorblob -root			    \n\
--- xscreensaver-slideshow-dri-detect.patch.orig
+++ xscreensaver-slideshow-dri-detect.patch
@@ -1,8 +1,9 @@
 Index: hacks/glx/glslideshow.c
 ===================================================================
---- hacks/glx/glslideshow.c.orig	2011-09-28 22:34:41.000000000 +0200
-+++ hacks/glx/glslideshow.c	2012-02-20 20:20:41.130046097 +0100
-@@ -994,6 +994,29 @@ sanity_check (ModeInfo *mi)
+--- hacks/glx/glslideshow.c.orig
++++ hacks/glx/glslideshow.c
+@@ -1021,8 +1021,31 @@ sanity_check (ModeInfo *mi)
+   if      (fps_cutoff < 0)  fps_cutoff = 0;
    else if (fps_cutoff > 30) fps_cutoff = 30;
  }
  
@@ -32,7 +33,9 @@ Index: hacks/glx/glslideshow.c
  
  static void
  check_fps (ModeInfo *mi)
-@@ -1003,7 +1026,6 @@ check_fps (ModeInfo *mi)
+ {
+@@ -1030,9 +1053,8 @@ check_fps (ModeInfo *mi)
+ 
    slideshow_state *ss = &sss[MI_SCREEN(mi)];
  
    double start_time, end_time, wall_elapsed, frame_duration, fps;
@@ -40,7 +43,9 @@ Index: hacks/glx/glslideshow.c
  
    start_time = ss->now;
    end_time = double_time();
-@@ -1034,22 +1056,7 @@ check_fps (ModeInfo *mi)
+   frame_duration = end_time - start_time;   /* time spent drawing this frame */
+@@ -1061,24 +1083,9 @@ check_fps (ModeInfo *mi)
+ 
    fprintf (stderr,
             "%s: only %.1f fps!  Turning off pan/fade to compensate...\n",
             blurb(), fps);
@@ -64,7 +69,9 @@ Index: hacks/glx/glslideshow.c
  #endif /* HAVE_COCOA */
  }
  
-@@ -1089,7 +1096,13 @@ init_slideshow (ModeInfo *mi)
+ 
+@@ -1116,9 +1123,15 @@ init_slideshow (ModeInfo *mi)
+   }
    ss = &sss[screen];
  
    if ((ss->glx_context = init_GL(mi)) != NULL) {
@@ -79,3 +86,4 @@ Index: hacks/glx/glslideshow.c
    } else {
      MI_CLEARWINDOW(mi);
    }
+ 
--- xscreensaver.changes.orig
+++ xscreensaver.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Wed Sep 25 10:19:15 CEST 2013 - kurt@garloff.de
+
+- Refresh patches.
+
+-------------------------------------------------------------------
 Thu Aug  1 14:55:13 UTC 2013 - coolo@suse.com
 
 - update to 5.22
@@ -39,6 +44,21 @@ Wed Dec 26 04:28:59 UTC 2012 - andrea@op
   to apply to new code
 
 -------------------------------------------------------------------
+Tue Nov 27 10:49:51 CET 2012 - garloff@suse.de
+
+- Rmove parts of filename when displaying.
+
+-------------------------------------------------------------------
+Mon Nov 26 23:26:29 CET 2012 - garloff@suse.de
+
+- And fix movie playing ... 
+
+-------------------------------------------------------------------
+Sat Nov 24 22:42:42 CET 2012 - kurt@garloff.de
+
+- Improved movie logic for glslideshow.sh.
+
+-------------------------------------------------------------------
 Tue Sep 18 12:55:31 UTC 2012 - coolo@suse.com
 
 - add explicit buildrequire on pkgconfig(glu)
@@ -179,6 +199,22 @@ Tue Jun  2 18:46:16 CEST 2009 - sbrabec@
 - Prevent warnings in xscreensaver-getimage-file (bnc#408673).
 
 -------------------------------------------------------------------
+Sun May 17 10:46:16 CEST 2009 - garloff@suse.de
+
+ - Fix memory leak.
+ - Follow links.
+
+-------------------------------------------------------------------
+Tue May 12 18:12:09 CEST 2009 - garloff@suse.de
+
+- Add patches for better glslideshow:
+  * Use higher res textures for zooming in
+  * Speedup texture conversion on x86/x86-64 (SSE2)
+  * Tweak zoom heuristics
+  * Consider direct use of pixmap
+  * Package script glslideshow.sh
+
+-------------------------------------------------------------------
 Tue Sep 30 11:45:57 CEST 2008 - pgajdos@suse.cz
 
 - fixed [bnc#368582]
--- xscreensaver.spec.orig
+++ xscreensaver.spec
@@ -17,20 +17,29 @@
 
 
 Name:           xscreensaver
-BuildRequires:  Mesa-devel
 BuildRequires:  automake
 BuildRequires:  bc
 BuildRequires:  gdm
 BuildRequires:  intltool
+BuildRequires:  libdrm-devel
 BuildRequires:  libglade2-devel
-BuildRequires:  libgle-devel
 BuildRequires:  libgnome-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  pam-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  update-desktop-files
-BuildRequires:  xorg-x11-devel
-BuildRequires:  pkgconfig(glu)
+#BuildRequires:  xorg-x11-devel
+BuildRequires:  Mesa-devel
+#BuildRequires:  pkgconfig(glu)
+%if 0%{?suse_version} >= 1120
+BuildRequires:  Mesa-libGL-devel
+BuildRequires:  Mesa-libGL1
+BuildRequires:  libgle-devel
+%else
+%endif
+%if 0%{?sles_version} == 11
+BuildRequires:  gconf2-branding-SLES
+%endif
 Provides:       xscreensaver-gnome
 Provides:       xscrns
 Obsoletes:      xscreensaver-gnome
@@ -49,12 +58,19 @@ Source:         http://www.jwz.org/xscre
 Source1:        xscreensaver.pamd
 Source2:        xscreensaver-data.list
 Source3:        xscreensaver-data-extra.list
+Source10:       glslideshow.sh
 Patch5:         xscreensaver-background.patch
 Patch20:        xscreensaver-mansuffix.patch
 Patch21:        xscreensaver-default-screensaver.patch
 Patch24:        xscreensaver-slideshow-dri-detect.patch
 Patch29:        xscreensaver-ignore-no-pwent-password.patch
 Patch32:        xscreensaver-fireworkx-man.patch
+#Patch34:        xscreensaver-strict-aliasing.patch
+Patch40:        xscreensaver-higher-res.diff
+Patch41:        xscreensaver-speedup-conv.diff
+Patch42:        xscreensaver-zoom-heuristics.diff
+Patch43:        xscreensaver-consider-gltexture.diff
+Patch44:        xscreensaver-filename.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -116,6 +132,13 @@ This packages contains additional graphi
 %patch24
 %patch29
 %patch32
+#Most of the old patch was applied upstream - not sure the rest is really needed still
+##%patch34
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
 # KDE and GNOME have its own screensavers:
 echo 'NotShowIn=KDE;GNOME;' >>driver/screensaver-properties.desktop.in
 
@@ -144,6 +167,10 @@ sed -re '
 intltoolize --copy --force
 sed -i "s:@install_sh@:../install-sh -c:" po/Makefile.in.in
 chmod +x install-sh
+%ifarch %ix86
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -msse2"
+export CFLAGS="$RPM_OPT_FLAGS"
+%endif
 autoreconf -f -i
 # Disable direct PAM use and shadow (both needs suid).
 %configure\
@@ -184,6 +211,8 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/xscr
 install -d -m 755 $RPM_BUILD_ROOT/etc/pam.d
 install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/pam.d/xscreensaver
 #
+install -m 755 %SOURCE10 $RPM_BUILD_ROOT/%{_bindir}
+# 
 # language files
 %find_lang %{name}
 #
@@ -200,7 +229,7 @@ done
 for hack in `grep -v '#' %{SOURCE3}`; do
         test -f %{buildroot}%{_mandir}/man6/$hack.6* && echo "%doc %{_mandir}/man6/$hack.6*" >> %{name}-data-extra.lst
         test -f %{buildroot}%{_sysconfdir}/xscreensaver/$hack.xml && echo "%config %{_sysconfdir}/xscreensaver/$hack.xml" >> %{name}-data-extra.lst
-        echo "%{_libdir}/xscreensaver/$hack" >> %{name}-data-extra.lst
+        test -f %{buildroot}%{_libdir}/xscreensaver/$hack && echo "%{_libdir}/xscreensaver/$hack" >> %{name}-data-extra.lst
 done
 
 %clean
@@ -213,6 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xscreensaver-command
 %{_bindir}/xscreensaver-demo
 %{_bindir}/xscreensaver-gl-helper
+%{_bindir}/glslideshow.sh
 %{_datadir}/applications/xscreensaver-properties.desktop
 %{_datadir}/pixmaps/xscreensaver.xpm
 %dir %{_datadir}/xscreensaver/
openSUSE Build Service is sponsored by