mesa & libdrm updates, new qtwebkit, waiting for qupzilla before uploading, running tests on new cups

This commit is contained in:
abveritas 2012-05-29 03:49:15 +00:00
parent a24e79b816
commit a8bb39dd93
6 changed files with 102 additions and 198 deletions

View File

@ -1,19 +1,15 @@
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# maintainer abveritas@chakraproject.org
pkgbase=cups
pkgname=('libcups' 'cups')
pkgver=1.5.2
pkgver=1.5.3
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme')
makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' 'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme')
source=("ftp://ftp.easysw.com/pub/cups/${pkgver}/${pkgbase}-${pkgver}-source.tar.bz2"
#cups-avahi-1-config.patch
#cups-avahi-2-backend.patch
@ -22,8 +18,9 @@ source=("ftp://ftp.easysw.com/pub/cups/${pkgver}/${pkgbase}-${pkgver}-source.tar
#cups-avahi-5-services.patch
cups-no-export-ssllibs.patch
cups-no-gcrypt.patch
cups-no-gzip-man.patch
cups cups.logrotate cups.pam)
md5sums=('9471d2a7c920cfbb17133c32d2e6866f'
md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
#'fe3906f7733f8f63e05daf025d05abf3'
#'80e2d7d6ffcf125f917dca795e161efd'
#'eef9b879d9bdfb04c2042f57d07969b4'
@ -31,6 +28,7 @@ md5sums=('9471d2a7c920cfbb17133c32d2e6866f'
#'ca64df54a3a2dc53c28e6291e8d53d8f'
'9b8467a1e51d360096b70e2c3c081e6c'
'3733c23e77eb503bd94cc368e02830dc'
'd8fce4246d42186d9b190c1f07f5b911'
'9657daa21760bb0b5fa3d8b51d5e01a1'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17')
@ -39,7 +37,7 @@ build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
# Avahi support in the dnssd backend. patches from upstream/FC RawHide
patch -Np1 -i ${srcdir}/cups-avahi-1-config.patch
#patch -Np1 -i ${srcdir}/cups-avahi-1-config.patch
#patch -Np1 -i ${srcdir}/cups-avahi-2-backend.patch
#patch -Np1 -i ${srcdir}/cups-avahi-3-timeouts.patch
#patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch
@ -56,13 +54,13 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--libdir=/usr/lib \
--with-logdir=/var/log/cups \
--with-docdir=/usr/share/cups/doc \
--with-cups-user=daemon \
--with-cups-group=lp \
--enable-pam=yes \
--disable-ldap \
--libdir=/usr/lib \
--enable-raw-printing \
--enable-dbus \
--with-dbusdir=/etc/dbus-1 \
@ -92,8 +90,6 @@ package_cups() {
pkgdesc="The CUPS Printing System - deamon package"
install=cups.install
backup=(etc/cups/cupsd.conf
etc/cups/mime.convs
etc/cups/mime.types
etc/cups/snmp.conf
etc/cups/printers.conf
etc/cups/classes.conf
@ -103,7 +99,7 @@ backup=(etc/cups/cupsd.conf
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'dbus-core' 'hicolor-icon-theme')
optdepends=('php: for included phpcups.so module')
cd "${srcdir}/${pkgbase}-${pkgver}"

View File

@ -0,0 +1,18 @@
diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
--- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200
+++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200
@@ -69,10 +69,10 @@ case "$uname" in
;;
Linux* | GNU* | Darwin*)
# Linux, GNU Hurd, and Mac OS X
- MAN1EXT=1.gz
- MAN5EXT=5.gz
- MAN7EXT=7.gz
- MAN8EXT=8.gz
+ MAN1EXT=1
+ MAN5EXT=5
+ MAN7EXT=7
+ MAN8EXT=8
MAN8DIR=8
;;
*)

View File

@ -1,23 +1,23 @@
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas@chakra-project.org
pkgname=libdrm
pkgver=2.4.27
pkgver=2.4.33
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
license=('custom')
depends=('glibc' 'libpciaccess')
makedepends=('cairo' 'valgrind')
options=('!libtool')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
no-pthread-stubs.patch
COPYING)
md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd'
'c722c8406507b7e3a8da7a3030d1d9cf'
md5sums=('eb2a76720af5051b1687328a2240daed'
'304b2790d2098711d138a0b8c19df20c'
'ba65e71c481b94ef0fb6c23c7f21ffa1')
build() {

View File

@ -9,12 +9,12 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
-AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS)
-
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
AC_SUBST(PCIACCESS_CFLAGS)
AC_SUBST(PCIACCESS_LIBS)
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
AC_ARG_ENABLE([udev],
--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
@@ -26,14 +26,13 @@
@@ -26,7 +26,6 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
@ -22,14 +22,14 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
$(PCIACCESS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
@@ -34,7 +33,6 @@
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_LIBADD = ../libdrm.la \
- @PTHREADSTUBS_LIBS@ \
@PCIACCESS_LIBS@ \
@CLOCK_LIB@
libdrm_intel_la_SOURCES = \
intel_bufmgr.c \
--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
@@ -26,13 +26,12 @@

View File

@ -1,92 +1,49 @@
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
# maintainer abveritas@chakra-project.org
pkgbase=mesa
pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
# prepare 7.12/8.0
#pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri')
#_git=true
_gitdate=20111031
_git=false
if [ "${_git}" = "true" ]; then
#pkgver=7.10.99.git20110709
pkgver=7.11
else
pkgver=7.11.2
fi
pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
pkgver=8.0.3
pkgrel=1
arch=('i686' 'x86_64')
makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1'
'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=(LICENSE)
if [ "${_git}" = "true" ]; then
# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
else
source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
'0837c52698fe3252369c3fdb5195afcc')
source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
'LICENSE')
md5sums=('cc5ee15e306b8c15da6a478923797171'
'5c65a0fe315dd347e09b1f2826a1df5a')
build() {
cd ${srcdir}/?esa-*
if [ "${_git}" = "true" ]; then
autoreconf -vfi
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
--with-gallium-drivers=r300,r600,nouveau,swrast \
--enable-gallium-llvm \
--enable-gallium-egl --enable-shared-glapi\
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
--disable-glut \
--enable-gles1 \
--enable-gles2 \
--enable-egl \
--enable-texture-float \
--enable-shared-dricore
# --enable-gallium-svga \
else
autoreconf -vfi
autoreconf -vfi
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
--with-gallium-drivers=r300,r600,nouveau,swrast \
--with-gallium-drivers=r300,r600,nouveau,svga,swrast \
--enable-gallium-llvm \
--enable-gallium-egl --enable-shared-glapi\
--enable-gallium-egl \
--enable-shared-glapi\
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
--disable-glut \
--enable-dri \
--enable-glx \
--enable-gles1 \
--enable-gles2 \
--enable-egl \
--enable-texture-float \
--enable-shared-dricore
fi
--enable-shared-dricore \
--enable-xa
make
}
package_libgl() {
depends=('libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
depends=('libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib"
@ -99,7 +56,6 @@ package_libgl() {
cd src/mesa/drivers/dri
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
@ -165,7 +121,7 @@ package_libegl() {
}
package_khrplatform-devel() {
depends=()
#depends=()
pkgdesc="Khronos platform development package"
cd ${srcdir}/?esa-*
@ -218,66 +174,10 @@ package_intel-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for Intel"
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
}
package_unichrome-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome"
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
}
package_mach64-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for ATI Mach64"
conflicts=('xf86-video-mach64<6.8.2')
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
}
package_mga-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for Matrox"
conflicts=('xf86-video-mga<1.4.11')
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
}
package_r128-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for ATI Rage128"
conflicts=('xf86-video-r128<6.8.1')
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
}
package_savage-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage"
conflicts=('xf86-video-savage<2.3.1')
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
}
package_sis-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for SiS"
conflicts=('xf86-video-sis<0.10.2')
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
}
package_tdfx-dri() {
depends=("libgl")
pkgdesc="Mesa DRI drivers for 3dfx"
conflicts=('xf86-video-tdfx<1.4.3')
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
}
package_nouveau-dri() {
depends=("libgl")
pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
@ -288,21 +188,9 @@ package_nouveau-dri() {
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
}
#package_llvm-dri() {
# depends=("libgl")
# pkgdesc="Mesa common LLVM support"
package_svga-dri() {
depends=("mesa=${pkgver}")
pkgdesc="Gallium3D VMware guest GL driver"
#if [ "${_git}" = "true" ]; then
# cd ${srcdir}/mesa-*/src/gallium
# else
# cd "${srcdir}/Mesa-${pkgver}/src/gallium"
#fi
# gallium llvmpipe
#if [ "${_git}" = "true" ]; then
# make -C drivers/llvmpipe DESTDIR="${pkgdir}" install
# #make -C targets/dri-swrast DESTDIR="${pkgdir}" install
# else
# make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
#fi
#}
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
}

View File

@ -1,55 +1,57 @@
#
# QT Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer abveritas@chakra-project.org
# contributor Mladen Pejaković <pejakm at gmail dot com>
pkgname=qtwebkit
pkgver=2.2.2
pkgrel=1
pkgdesc="Standalone qtwebkit version"
_rev=r118179
arch=('i686' 'x86_64')
url="http://www.qtsoftware.com"
license=('GPL3' 'LGPL')
depends=('qt' 'qt-mobility' 'gstreamer0.10' 'gstreamer0.10-base' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ffmpeg' 'gstreamer0.10-ugly-plugins' )
makedepends=('gperf' 'sqlite3' 'fontconfig' 'phonon' 'perl' 'python2' 'mesa')
#source=("http://get.qt.nokia.com/qtwebkit/QtWebKit-${pkgver}.tar.gz")
source=("http://chakra-linux.org/sources/$pkgname/qtwebkit-$pkgver-source.tar.gz"
"http://chakra-linux.org/sources/$pkgname/qwebview-4.8.2.tar.xz"
'glib.patch')
url='http://trac.webkit.org/wiki/QtWebKit'
pkgdesc='An open source web browser engine (Qt port)'
license=('LGPL2.1' 'GPL3')
depends=('qt' 'qt-mobility' 'gstreamer0.10' 'gstreamer0.10-base' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ffmpeg' 'gstreamer0.10-ugly-plugins')
makedepends=('gperf' 'sqlite3' 'fontconfig' 'perl' 'python2' 'mesa')
conflicts=('qt<4.8')
md5sums=('86702e3a908e2968e87baa6600cbf31f'
'24e7a7cc0f6046cb0736c1039f64361e'
'23e8db5dda7004dd589e0f86799dea4e')
source=("http://builds.nightly.webkit.org/files/trunk/src/WebKit-${_rev}.tar.bz2"
"http://chakra-linux.org/sources/$pkgname/qwebview-4.8.2.tar.xz")
sha1sums=('8d8e21163951b55c17e27f88631bf36fba33d41d'
'33c83272ed8110180ee6e7e3733e68cc513e2802')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}-source
patch -p1 -i "${srcdir}"/glib.patch
cd "${srcdir}"/WebKit-${_rev}
#rm -f "${srcdir}"/WebKit-${_rev}/qwebview-4.8.2
#ln -s "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.2 "${srcdir}"/WebKit-${_rev}/
#export QT4DIR=$srcdir/$pkgname
#export PATH=${QT4DIR}/bin:${PATH}
#Tools/Scripts/build-webkit --qt --release --3d-canvas --accelerated-2d-canvas --3d-rendering \
# --geolocation --blob --link-prefetch
cd Tools/Scripts
# move headers
#mv include Source/
QTDIR=/usr/share/qt ./build-webkit --prefix=/usr --qt --webgl --release --microdata \
--link-prefetch --accelerated-2d-canvas --3d-rendering \
--animation-api --input-type-date \
--input-type-datetime --input-type-datetimelocal --input-type-month --input-type-week --style-scoped \
--svg-dom-objc-bindings --svg-fonts --tiled-backing-store \
--web-sockets --web-timing --page-visibility-api \
--touch-events --touch-icon-loading --icon-database \
--javascript-debugger --progress-tag --download-attribute \
--sql-database --xslt \
--makeargs="${MAKEFLAGS}"
cd Source
qmake
cd ../
make -C Source
cd "${srcdir}"/qtwebkit-${pkgver}-source/qwebview-4.8.2/plugins/qwebview
qmake
make
# Build the QWebView plugin
cd "${srcdir}"/qtwebkit-${pkgver}-source/qwebview-4.8.2/plugins/qwebview
qmake
make
}
package() {
cd "${srcdir}"/${pkgname}-${pkgver}-source
make INSTALL_ROOT=$pkgdir install
cd "${srcdir}"/WebKit-${_rev}
make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
cd "${srcdir}"/qtwebkKit-${pkgver}/qwebview-4.8.2/plugins/qwebview
make INSTALL_ROOT="${pkgdir}" install
# Fix RPATH
#chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
cd "${srcdir}"/qtwebkit-${pkgver}-source/qwebview-4.8.2/plugins/qwebview
make INSTALL_ROOT="${pkgdir}" install
}