Ship backgrounds as jpeg

5 files changed, 64 insertions, 41 deletions

diff --git a/Makefile b/Makefile
index 647577c..219db14 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME=mandriva-theme
 PACKAGE=mandriva-theme
-VERSION=1.2.22
+VERSION=1.2.23
 
 THEMES=Mandriva-Free Mandriva-One Mandriva-Powerpack Mandriva-Flash
 
@@ -12,19 +12,26 @@ SVNSOFT=svn+ssh://svn.mandriva.com/svn/soft/theme/mandriva-theme/
 SVNNAME=svn+ssh://svn.mandriva.com/svn/packages/cooker/mandriva-theme/current/
 
 all:
+
+install:
+	@mkdir -p $(prefix)$(sharedir)/mdk/backgrounds/
 	@/bin/cp -f gimp/scripts/gimp-normalize-to-bootsplash.scm tmp-gimp-command
+	@cat gimp/scripts/gimp-convert-to-jpeg.scm >> tmp-gimp-command
 	@for i in */bootsplash/data/*.png */gfxboot/*.png ; do \
 	    echo \(gimp-normalize-to-bootsplash 1.0 \"$$i\" \"`dirname $$i`/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
 	done
+	@for i in */background/*.png ; do \
+            echo \(gimp-convert-to-jpeg 0.98 \"$$i\" \"$(prefix)$(sharedir)/mdk/backgrounds/`basename $$i .png`.jpg\"\) >> tmp-gimp-command; \
+	done
 	@echo \(gimp-quit 1\) >> tmp-gimp-command
+	@echo running gimp to convert images
 	@cat tmp-gimp-command | gimp  --console-messages -i  -d  -b -
 	@rm -f tmp-gimp-command
 #	GIMP2_DIRECTORY=`pwd`/gimp gimp  --console-messages -i -d  -b '(begin (gimp-normalize-to-bootsplash-dirs "1.0" "*" "bootsplash/data/*.png") (gimp-quit 1))'
 #	GIMP2_DIRECTORY=`pwd`/gimp gimp --console-messages -i -d -b '(begin (gimp-normalize-to-bootsplash-dirs "1.0" "*" "gfxboot/*.png") (gimp-quit 1))'
-install:
+
 	mkdir -p $(prefix)$(sharedir)/bootsplash/themes/
 	mkdir -p $(prefix)$(configdir)/bootsplash/themes/
-	mkdir -p $(prefix)$(sharedir)/mdk/backgrounds/root
 	mkdir -p $(prefix)/$(sharedir)/mdk/screensaver
 	mkdir -p $(prefix)$(sharedir)/config/
 	mkdir -p $(prefix)$(sharedir)/bootsplash/Mandriva-common/images
@@ -40,11 +47,10 @@ install:
 	    install -m644 $$t/bootsplash/config/* $(prefix)$(configdir)/bootsplash/themes/$$t/config/; \
 	  fi; \
 	  install -d $(prefix)/$(configdir)/bootsplash/themes/$$t/animations;  \
-	  install -m644 $$t/background/$$t-*.png $(prefix)$(sharedir)/mdk/backgrounds/; \
 	  install -m644 $$t/background/$$t.xml $(prefix)$(sharedir)/mdk/backgrounds/; \
 	  for d in 1024x768 1280x1024 1280x800 1440x900 1600x1200 1680x1050 1920x1200 1920x1440 ; \
 	  do \
-	    ln -f -s $$t-$$d-1300.png $(prefix)$(sharedir)/mdk/backgrounds/$$t-$$d.png; \
+	    ln -f -s $$t-$$d-1300.jpg $(prefix)$(sharedir)/mdk/backgrounds/$$t-$$d.jpg; \
 	  done; \
 	  source $$t/bootsplash/colors; \
 	  for d in 800x600 1024x768 1280x1024 1600x1200; \
diff --git a/Mandriva-Free/background/Mandriva-Free.xml b/Mandriva-Free/background/Mandriva-Free.xml
index 8171092..36f8711 100644
--- a/Mandriva-Free/background/Mandriva-Free.xml
+++ b/Mandriva-Free/background/Mandriva-Free.xml
@@ -12,52 +12,52 @@
 <!-- We start with sunrise at 7 AM. It will remain up for 1 hour. -->
 <static>
 <duration>3600.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Free-0700.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Free-0700.jpg</file>
 </static>
 
 <!-- Sunrise starts to transition to day at 8 AM. The transition lasts for 5 hours, ending at 1 PM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Free-0700.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-PowerPack-1300.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Free-0700.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-PowerPack-1300.jpg</to>
 </transition>
 
 <!-- It's 1 PM, we're showing the day image in full force now, for 2 hours ending at 3 PM. -->
 <static>
 <duration>7200.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Free-1300.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Free-1300.jpg</file>
 </static>
 
 <!-- It's 3 PM, and we're starting to transition to sunset. Transition completes at 6 PM. -->
 <transition type="overlay">
 <duration>10800.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Free-1300.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-Free-1800.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Free-1300.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-Free-1800.jpg</to>
 </transition>
 
 <!-- It's 6 PM, and it's sunset, for an hour. Ends at 7. -->
 <static>
 <duration>3600.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Free-1800.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Free-1800.jpg</file>
 </static>
 
 <!-- It's 7 PM and it's going to start to get darker. This will transition for 5 hours up until midnight. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Free-1800.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-Free-0000.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Free-1800.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-Free-0000.jpg</to>
 </transition>
 
 <!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. -->
 <static>
 <duration>18000.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Free-0000.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Free-0000.jpg</file>
 </static>
 
 <!-- It's 5 AM. We'll start transitioning to sunrise for 2 hours up until 7 AM. -->
 <transition type="overlay">
 <duration>7200.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Free-0000.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-Free-0700.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Free-0000.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-Free-0700.jpg</to>
 </transition>
 </background>
diff --git a/Mandriva-One/background/Mandriva-One.xml b/Mandriva-One/background/Mandriva-One.xml
index 22461d2..22b1261 100644
--- a/Mandriva-One/background/Mandriva-One.xml
+++ b/Mandriva-One/background/Mandriva-One.xml
@@ -12,52 +12,52 @@
 <!-- We start with sunrise at 7 AM. It will remain up for 1 hour. -->
 <static>
 <duration>3600.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-One-0700.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-One-0700.jpg</file>
 </static>
 
 <!-- Sunrise starts to transition to day at 8 AM. The transition lasts for 5 hours, ending at 1 PM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-One-0700.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-PowerPack-1300.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-One-0700.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-PowerPack-1300.jpg</to>
 </transition>
 
 <!-- It's 1 PM, we're showing the day image in full force now, for 2 hours ending at 3 PM. -->
 <static>
 <duration>7200.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-One-1300.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-One-1300.jpg</file>
 </static>
 
 <!-- It's 3 PM, and we're starting to transition to sunset. Transition completes at 6 PM. -->
 <transition type="overlay">
 <duration>10800.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-One-1300.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-One-1800.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-One-1300.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-One-1800.jpg</to>
 </transition>
 
 <!-- It's 6 PM, and it's sunset, for an hour. Ends at 7. -->
 <static>
 <duration>3600.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-One-1800.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-One-1800.jpg</file>
 </static>
 
 <!-- It's 7 PM and it's going to start to get darker. This will transition for 5 hours up until midnight. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-One-1800.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-One-0000.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-One-1800.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-One-0000.jpg</to>
 </transition>
 
 <!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. -->
 <static>
 <duration>18000.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-One-0000.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-One-0000.jpg</file>
 </static>
 
 <!-- It's 5 AM. We'll start transitioning to sunrise for 2 hours up until 7 AM. -->
 <transition type="overlay">
 <duration>7200.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-One-0000.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-One-0700.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-One-0000.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-One-0700.jpg</to>
 </transition>
 </background>
diff --git a/Mandriva-Powerpack/background/Mandriva-Powerpack.xml b/Mandriva-Powerpack/background/Mandriva-Powerpack.xml
index c0e9f89..9ccc6a5 100644
--- a/Mandriva-Powerpack/background/Mandriva-Powerpack.xml
+++ b/Mandriva-Powerpack/background/Mandriva-Powerpack.xml
@@ -12,52 +12,52 @@
 <!-- We start with sunrise at 7 AM. It will remain up for 1 hour. -->
 <static>
 <duration>3600.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0700.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0700.jpg</file>
 </static>
 
 <!-- Sunrise starts to transition to day at 8 AM. The transition lasts for 5 hours, ending at 1 PM. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0700.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-PowerPack-1300.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0700.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-PowerPack-1300.jpg</to>
 </transition>
 
 <!-- It's 1 PM, we're showing the day image in full force now, for 2 hours ending at 3 PM. -->
 <static>
 <duration>7200.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1300.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1300.jpg</file>
 </static>
 
 <!-- It's 3 PM, and we're starting to transition to sunset. Transition completes at 6 PM. -->
 <transition type="overlay">
 <duration>10800.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1300.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1800.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1300.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1800.jpg</to>
 </transition>
 
 <!-- It's 6 PM, and it's sunset, for an hour. Ends at 7. -->
 <static>
 <duration>3600.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1800.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1800.jpg</file>
 </static>
 
 <!-- It's 7 PM and it's going to start to get darker. This will transition for 5 hours up until midnight. -->
 <transition type="overlay">
 <duration>18000.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1800.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0000.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-1800.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0000.jpg</to>
 </transition>
 
 <!-- It's midnight. It'll stay dark for 5 hours up until 5 AM. -->
 <static>
 <duration>18000.0</duration>
-<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0000.png</file>
+<file>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0000.jpg</file>
 </static>
 
 <!-- It's 5 AM. We'll start transitioning to sunrise for 2 hours up until 7 AM. -->
 <transition type="overlay">
 <duration>7200.0</duration>
-<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0000.png</from>
-<to>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0700.png</to>
+<from>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0000.jpg</from>
+<to>/usr/share/mdk/backgrounds/Mandriva-Powerpack-0700.jpg</to>
 </transition>
 </background>
diff --git a/gimp/scripts/gimp-convert-to-jpeg.scm b/gimp/scripts/gimp-convert-to-jpeg.scm
new file mode 100644
index 0000000..f184b88
--- /dev/null
+++ b/gimp/scripts/gimp-convert-to-jpeg.scm
@@ -0,0 +1,17 @@
+
+(define (gimp-convert-to-jpeg quality infile outfile)
+   (let* ((image (car (file-png-load 1 infile infile)))
+         )
+	
+	(gimp-image-flatten image)
+
+     	(let* ((drawable (car (gimp-image-get-active-drawable image))))
+		(if (= (car (gimp-drawable-is-rgb drawable)) FALSE)
+		    (gimp-image-convert-rgb image))
+
+		(file-jpeg-save 1 image drawable outfile outfile quality 0 1 0 "Mandriva Theme" 2 1 0 2 )
+		(gimp-image-delete image)
+	 )
+	
+   )
+)