Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=9cd21a2baabc58cda4e87c151bfd062e47bc9b2a
commit 9cd21a2baabc58cda4e87c151bfd062e47bc9b2a Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Apr 20 16:09:58 2010 +0200 directfb-1.2.0-3-x86_64 * Rebuild with new libs. diff --git a/source/xlib/directfb/FrugalBuild b/source/xlib/directfb/FrugalBuild index 4652a08..d66d1a2 100644 --- a/source/xlib/directfb/FrugalBuild +++ b/source/xlib/directfb/FrugalBuild @@ -5,17 +5,18 @@ pkgname=directfb _F_archive_name=DirectFB pkgver=1.2.0 _pkgver=1.2-0 -pkgrel=2 +pkgrel=3 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device." url="http://www.directfb.org"; license="LGPL" -depends=('sdl' 'sysfsutils' 'freetype2' 'libpng' 'libjpeg' 'libmpeg3' 'zlib' 'libx11>=1.2.1' 'libxext') +depends=('sdl' 'sysfsutils' 'freetype2' 'libpng>=1.4.1' 'libjpeg>=8a' 'libmpeg3' 'zlib' 'libx11>=1.2.1' 'libxext') makedepends=('xextproto') groups=('xlib') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://directfb.org/index.php?path=Main%2FDownloads | Flasttar" -source=(http://www.directfb.org/downloads/Core/$_F_archive_name-$pkgver.tar.gz) -sha1sums=('a98268f872442c754e02f18e020f7e11b9554344') +source=(http://www.directfb.org/downloads/Core/$_F_archive_name-1.2/$_F_archive_name-$pkgver.tar.gz libpng1.4.diff) +sha1sums=('a98268f872442c754e02f18e020f7e11b9554344' \ + '61bae7ff369e9680c45e7bacedb11f621c04a99c') subpkgs=("$pkgname-video-i810" "$pkgname-video-i830" "$pkgname-video-savage" "$pkgname-video-neomagic" \ "$pkgname-video-unichrome" "$pkgname-video-nv" "$pkgname-video-sis" "$pkgname-video-mga" "$pkgname-video-ati" \ @@ -45,7 +46,7 @@ subdescs=('DirectFB video driver for Intel i810 cards' \ 'DirectFB driver for penmount input devices' \ 'DirectFB driver for sonypi input devices' \ 'DirectFB driver for wm97xx_ts input devices') -subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ +subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ @@ -87,7 +88,7 @@ build() { Fsplit $pkgname-video-nsc usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_nsc.{a,la,o,so} Fsplit $pkgname-video-tdfx usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_tdfx.{a,la,o,so} Fsplit $pkgname-video-radeon usr/lib/$pkgname-$_pkgver/gfxdrivers/libdirectfb_radeon.{a,la,o,so} - + # Input drivers Fsplit $pkgname-input-joystick usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_joystick.{a,la,o,so} Fsplit $pkgname-input-keyboard usr/lib/$pkgname-$_pkgver/inputdrivers/libdirectfb_keyboard.{a,la,o,so} diff --git a/source/xlib/directfb/libpng1.4.diff b/source/xlib/directfb/libpng1.4.diff new file mode 100644 index 0000000..ec8e337 --- /dev/null +++ b/source/xlib/directfb/libpng1.4.diff @@ -0,0 +1,43 @@ +http://repos.archlinux.org/wsvn/community/directfb/trunk/libpng-1.4.patch + +--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c ++++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c +@@ -168,7 +168,7 @@ + static DFBResult + Probe( IDirectFBImageProvider_ProbeContext *ctx ) + { +- if (png_check_sig( ctx->header, 8 )) ++ if (!png_sig_cmp( ctx->header, 0, 8 )) + return DFB_OK; + + return DFB_UNSUPPORTED; +--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c ++++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c +@@ -653,7 +653,7 @@ + if (data->color_type == PNG_COLOR_TYPE_PALETTE) { + u32 key; + png_colorp palette = data->info_ptr->palette; +- png_bytep trans = data->info_ptr->trans; ++ png_bytep trans = data->info_ptr->trans_alpha; + int num_colors = MIN( MAXCOLORMAPSIZE, + data->info_ptr->num_palette ); + u8 cmap[3][num_colors]; +@@ -678,7 +678,7 @@ + } + else { + /* ...or based on trans rgb value */ +- png_color_16p trans = &data->info_ptr->trans_values; ++ png_color_16p trans = &data->info_ptr->trans_color; + + data->color_key = (((trans->red & 0xff00) << 8) | + ((trans->green & 0xff00)) | +@@ -689,7 +689,7 @@ + switch (data->color_type) { + case PNG_COLOR_TYPE_PALETTE: { + png_colorp palette = data->info_ptr->palette; +- png_bytep trans = data->info_ptr->trans; ++ png_bytep trans = data->info_ptr->trans_alpha; + int num_trans = data->info_ptr->num_trans; + int num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette ); + + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
