[Lunar-commits] r22400 - moonbase/trunk/graphics/jpeg

[Stefan Wold]

Author: ratler
Date: 2006-12-02 15:25:13 +0100 (Sat, 02 Dec 2006)
New Revision: 22400

Modified:
   moonbase/trunk/graphics/jpeg/BUILD
   moonbase/trunk/graphics/jpeg/DETAILS
Log:
Applied patchset which fix various stuff. This also fix
a build issue with x86_64.

* BUILD file cleaned up


Modified: moonbase/trunk/graphics/jpeg/BUILD
===================================================================
--- moonbase/trunk/graphics/jpeg/BUILD	2006-12-02 13:22:27 UTC (rev 22399)
+++ moonbase/trunk/graphics/jpeg/BUILD	2006-12-02 14:25:13 UTC (rev 22400)
@@ -1,17 +1,14 @@
 (
-
+  
   bad_flags -malign-double
-  export CC="gcc"
-  OPTS="$OPTS --enable-shared --enable-static"
+  OPTS="$OPTS --enable-shared --enable-static --enable-maxmem=64"
 
-  default_config &&
-  sedit "s/\$(prefix)\/man\/man\$(manext)/\/usr\/share\/man\/man\$(manext)/" Makefile &&
-  make  &&
-  ld --whole-archive -share -o .libs/libjpeg.so .libs/libjpeg.a
-  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD make test &&
-  prepare_install &&
-  make install &&
-  install -m755 -oroot -groot .libs/libjpeg.so /usr/lib/
-  ln -fs libjpeg.so /usr/lib/libjpeg.so.62
+  # Apply patchset
+  unpack $SOURCE2 &&
+  for i in jpeg-patches/*; do
+  	patch_it $i 1
+  done &&
+ 
+  default_build
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/graphics/jpeg/DETAILS
===================================================================
--- moonbase/trunk/graphics/jpeg/DETAILS	2006-12-02 13:22:27 UTC (rev 22399)
+++ moonbase/trunk/graphics/jpeg/DETAILS	2006-12-02 14:25:13 UTC (rev 22400)
@@ -1,17 +1,14 @@
           MODULE=jpeg
          VERSION=6b
           SOURCE=${MODULE}src.v$VERSION.tar.gz
+         SOURCE2=$MODULE-patches-0.1.tar.bz2
       SOURCE_URL=ftp://ftp.uu.net/graphics/$MODULE/
+     SOURCE2_URL=$LPATCH_URL/
       SOURCE_VFY=sha1:7079f0d6c42fad0cfba382cf6ad322add1ace8f9
-         SOURCE2=jpeg-c++.patch
-     SOURCE2_URL=$PATCH_URL/
-     SOURCE2_VFY=sha1:b70e6d3402db9d915649d85b1785c51f129205a1
-         SOURCE3=libjpeg-6b-arm.patch
-     SOURCE3_URL=$PATCH_URL/
-     SOURCE3_VFY=sha1:9cd16083f92befd0dcebeefcb3ffe7cbf7892614
-        WEB_SITE=http://www.ijg.org
+     SOURCE2_VFY=sha1:bebf6de61cae5ccedfc05897687fd6edbe8cbd6d
+        WEB_SITE=http://www.ijg.org/
          ENTERED=20010922
-         UPDATED=20020724
+         UPDATED=20061202
            SHORT="A library that supports the JPEG image format"
 
 cat << EOF