[arch-commits] Commit in racket/trunk (PKGBUILD jpeg-version.patch)
Date: Thursday, May 5, 2011 @ 01:05:42
Author: eric
Revision: 122617
upgpkg: racket 5.1.1-1
Upstream update, Added libffi depends, Added gsfonts makedepends to fix docs
(close FS#23613)
Modified:
racket/trunk/PKGBUILD
Deleted:
racket/trunk/jpeg-version.patch
+
PKGBUILD | 16 -
jpeg-version.patch | 621 ---
2 files changed, 8 insertions(+), 629 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-05-05 01:46:51 UTC (rev 122616)
+++ PKGBUILD2011-05-05 05:05:42 UTC (rev 122617)
@@ -2,28 +2,28 @@
# Maintainer: Eric Bélanger
pkgname=racket
-pkgver=5.1
+pkgver=5.1.1
pkgrel=1
pkgdesc="PLT Racket (a variant of Scheme) Environment"
arch=('i686' 'x86_64')
url="http://racket-lang.org/";
license=('LGPL')
-depends=('gtk2' 'libjpeg' 'desktop-file-utils')
+depends=('gtk2' 'libjpeg' 'libffi' 'desktop-file-utils')
+makedepends=('gsfonts')
provides=('drscheme')
conflicts=('drscheme')
replaces=('drscheme')
options=('!strip')
install=racket.install
source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz
\
-drracket.desktop jpeg-version.patch)
-md5sums=('c3b0bffb998ad530c06512d045a59f15' '9223c9736ead677431542b41271c7b3c'\
- '0aae72b6f19963c569d20fa8793482e1')
-sha1sums=('6c314a71bab77eb48efad8f6c9fa597b6a5a305d'
'a20808f6b250225704856f82a544681a962a299d'\
- 'afa13f3ef66f5434b209f545f82545a869ada2b2')
+drracket.desktop)
+md5sums=('26d6b320218497dba71630b9ad4dcf59'
+ '9223c9736ead677431542b41271c7b3c')
+sha1sums=('be339495aef3334530ea8fc63ef4014ad8a4b0b2'
+ 'a20808f6b250225704856f82a544681a962a299d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}/src"
- (cd ..; patch -p1 -i "${srcdir}/jpeg-version.patch")
./configure --prefix=/usr
make
}
Deleted: jpeg-version.patch
===
--- jpeg-version.patch 2011-05-05 01:46:51 UTC (rev 122616)
+++ jpeg-version.patch 2011-05-05 05:05:42 UTC (rev 122617)
@@ -1,621 +0,0 @@
-From: Matthew Flatt
-Date: Wed, 16 Feb 2011 14:30:34 + (-0700)
-Subject: fix jpeg structs to better adapt to jpeglib versions and platforms
-X-Git-Url:
http://git.racket-lang.org/plt/commitdiff_plain/e59b96e26c7f1edb193a42f16c97d30a085a182c
-
-fix jpeg structs to better adapt to jpeglib versions and platforms
- --- specifically fixing jpeglib version 8 on x86_64
-
-diff --git a/collects/racket/draw/unsafe/jpeg.rkt
b/collects/racket/draw/unsafe/jpeg.rkt
-index 9399aec..77606d8 100644
a/collects/racket/draw/unsafe/jpeg.rkt
-+++ b/collects/racket/draw/unsafe/jpeg.rkt
-@@ -100,20 +100,24 @@
- (unless (member JPEG_LIB_VERSION '(62 64 70 80))
- (error 'jpeg "unsupported library version: ~e" JPEG_LIB_VERSION))
-
--(define _scaled_size
-- (case JPEG_LIB_VERSION
--[(62 64) _int]
--[else (make-cstruct-type (list _int _int))]))
--
--(define _prog_scan_size
-- (case JPEG_LIB_VERSION
--[(62 64 70) (make-cstruct-type (list _int _int _int _int))]
--[else (make-cstruct-type (list _int _int _int _int _int _pointer _int))]))
--
--(define _comp_info_size
-- (case JPEG_LIB_VERSION
--[(62 64 70) _pointer]
--[else (make-cstruct-type (list _pointer _jbool))]))
-+(define-syntax-rule (cstruct-type/version elem ...)
-+ (make-cstruct-type (flatten-type (list (cstruct-type/version-elem elem)
...
-+
-+(define-syntax cstruct-type/version-elem
-+ (syntax-rules (unquote)
-+[(_ (unquote ([vers (elem ...)] ...)))
-+ (case JPEG_LIB_VERSION
-+ [vers (list (cstruct-type/version-elem elem) ...)]
-+ ...)]
-+[(_ [name type]) type]))
-+
-+(define (flatten-type l)
-+ (cond
-+ [(null? l) null]
-+ [(list? (car l))
-+(append (flatten-type (car l)) (flatten-type (cdr l)))]
-+ [else
-+(cons (car l) (flatten-type (cdr l)))]))
-
- (define-cstruct _jpeg_decompress_struct ([err _jpeg_error_mgr-pointer]
- [mem _jpeg_memory_mgr-pointer]
-@@ -150,7 +154,7 @@
- [enable_2pass_quant _jbool]
-
- [output_width _JDIMENSION]
-- [output_height _JDIMENSION]
-+ [output_height _JDIMENSION] ; <-
- [out_color_components _int]
- [output_components _int]
- [rec_outbuf_height _int]
-@@ -158,21 +162,230 @@
- [actual_number_of_colors _int]
- [colormap _pointer]
-
-- [output_scanline _JDIMENSION]
-+ ;; We don't need to refer to any of
the remaining
-+
[arch-commits] Commit in racket/trunk (PKGBUILD jpeg-version.patch)
Date: Thursday, February 17, 2011 @ 01:55:24
Author: eric
Revision: 110163
upgpkg: racket 5.1-1
Upstream update, Updated depends array
Added:
racket/trunk/jpeg-version.patch
Modified:
racket/trunk/PKGBUILD
+
PKGBUILD | 28 --
jpeg-version.patch | 621 +++
2 files changed, 631 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-16 22:10:58 UTC (rev 110162)
+++ PKGBUILD2011-02-17 06:55:24 UTC (rev 110163)
@@ -1,37 +1,29 @@
# $Id$
-# Maintainer: Eric Belanger
+# Maintainer: Eric Bélanger
pkgname=racket
-pkgver=5.0.2
-pkgrel=2
+pkgver=5.1
+pkgrel=1
pkgdesc="PLT Racket (a variant of Scheme) Environment"
arch=('i686' 'x86_64')
url="http://racket-lang.org/";
license=('LGPL')
-depends=('gcc-libs' 'cairo' 'desktop-file-utils' 'libjpeg' 'libgl' 'libxmu'
'libxft')
-makedepends=('mesa' 'libxaw')
+depends=('gtk2' 'libjpeg' 'desktop-file-utils')
provides=('drscheme')
conflicts=('drscheme')
replaces=('drscheme')
options=('!strip')
install=racket.install
source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz
\
-
http://downloads.sourceforge.net/sourceforge/libpng/libpng-1.4.5.tar.xz
drracket.desktop)
-md5sums=('21df9a2f9709026d8b3d040ba72deafc' '37d420c7d8294aac438c150bb4335901'\
- '9223c9736ead677431542b41271c7b3c')
-sha1sums=('e741630f6b524ef32a13b7df842592ccfe8d39c9'
'c31578e005090280203cb3a6080e44f38c3f1a51'\
- 'a20808f6b250225704856f82a544681a962a299d')
+drracket.desktop jpeg-version.patch)
+md5sums=('c3b0bffb998ad530c06512d045a59f15' '9223c9736ead677431542b41271c7b3c'\
+ '0aae72b6f19963c569d20fa8793482e1')
+sha1sums=('6c314a71bab77eb48efad8f6c9fa597b6a5a305d'
'a20808f6b250225704856f82a544681a962a299d'\
+ 'afa13f3ef66f5434b209f545f82545a869ada2b2')
build() {
-# Updating libpng source included in racket source tarball
- cd "${srcdir}/libpng-1.4.5/"
- cp pngmem.c pngpriv.h png.h pngconf.h pngwutil.c pngpread.c pngread.c
pngrutil.c png.c \
- pngwrite.c pngwtran.c pngrtran.c pngset.c pngtrans.c pngget.c pngrio.c \
- "${srcdir}/${pkgname}-${pkgver}/collects/plot/src/all"
- rm
"${srcdir}/${pkgname}-${pkgver}/collects/plot/src/all/"{pnggccrd.c,pngvcrd.c}
-
cd "${srcdir}/${pkgname}-${pkgver}/src"
- rm -r wxcommon/{jpeg,libpng,zlib}
+ (cd ..; patch -p1 -i "${srcdir}/jpeg-version.patch")
./configure --prefix=/usr
make
}
Added: jpeg-version.patch
===
--- jpeg-version.patch (rev 0)
+++ jpeg-version.patch 2011-02-17 06:55:24 UTC (rev 110163)
@@ -0,0 +1,621 @@
+From: Matthew Flatt
+Date: Wed, 16 Feb 2011 14:30:34 + (-0700)
+Subject: fix jpeg structs to better adapt to jpeglib versions and platforms
+X-Git-Url:
http://git.racket-lang.org/plt/commitdiff_plain/e59b96e26c7f1edb193a42f16c97d30a085a182c
+
+fix jpeg structs to better adapt to jpeglib versions and platforms
+ --- specifically fixing jpeglib version 8 on x86_64
+---
+
+diff --git a/collects/racket/draw/unsafe/jpeg.rkt
b/collects/racket/draw/unsafe/jpeg.rkt
+index 9399aec..77606d8 100644
+--- a/collects/racket/draw/unsafe/jpeg.rkt
b/collects/racket/draw/unsafe/jpeg.rkt
+@@ -100,20 +100,24 @@
+ (unless (member JPEG_LIB_VERSION '(62 64 70 80))
+ (error 'jpeg "unsupported library version: ~e" JPEG_LIB_VERSION))
+
+-(define _scaled_size
+- (case JPEG_LIB_VERSION
+-[(62 64) _int]
+-[else (make-cstruct-type (list _int _int))]))
+-
+-(define _prog_scan_size
+- (case JPEG_LIB_VERSION
+-[(62 64 70) (make-cstruct-type (list _int _int _int _int))]
+-[else (make-cstruct-type (list _int _int _int _int _int _pointer _int))]))
+-
+-(define _comp_info_size
+- (case JPEG_LIB_VERSION
+-[(62 64 70) _pointer]
+-[else (make-cstruct-type (list _pointer _jbool))]))
++(define-syntax-rule (cstruct-type/version elem ...)
++ (make-cstruct-type (flatten-type (list (cstruct-type/version-elem elem)
...
++
++(define-syntax cstruct-type/version-elem
++ (syntax-rules (unquote)
++[(_ (unquote ([vers (elem ...)] ...)))
++ (case JPEG_LIB_VERSION
++ [vers (list (cstruct-type/version-elem elem) ...)]
++ ...)]
++[(_ [name type]) type]))
++
++(define (flatten-type l)
++ (cond
++ [(null? l) null]
++ [(list? (car l))
++(append (flatten-type (car l)) (flatten-type (cdr l)))]
++ [else
++(cons (car l) (flatten-type (cdr l)))]))
+
+ (define-cstruct _jpeg_decompress_struct ([err _jpeg_error_mgr-pointer]
+ [mem _jpeg_memory_mgr-pointer]
+@@ -150,7 +154,7 @@
+ [enable_2pass_quant _jbool]
+
+ [output_width _JDIMENSION]
+- [output_height _JDIMENSION]
++
