summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/blas/Makefile.blas31
-rwxr-xr-xextra/blas/PKGBUILD10
-rw-r--r--extra/fuse/PKGBUILD6
-rw-r--r--extra/icedtea-web-java7/PKGBUILD11
-rw-r--r--extra/icedtea-web-java7/fix_firefox_crash.diff228
-rw-r--r--extra/icedtea-web/PKGBUILD18
-rw-r--r--extra/icedtea-web/fix_firefox_crash.diff228
-rw-r--r--extra/lapack/Makefile.lapack82
-rw-r--r--extra/lapack/PKGBUILD6
-rw-r--r--extra/latex2rtf/PKGBUILD24
-rw-r--r--extra/lyx/PKGBUILD8
-rw-r--r--extra/miro/PKGBUILD8
-rw-r--r--extra/nasm/PKGBUILD34
-rw-r--r--extra/qtiplot/PKGBUILD12
-rw-r--r--extra/suitesparse/PKGBUILD12
-rw-r--r--extra/vamp-plugin-sdk/PKGBUILD14
-rw-r--r--extra/vlc/PKGBUILD5
-rw-r--r--extra/xf86-input-evdev/PKGBUILD6
18 files changed, 643 insertions, 100 deletions
diff --git a/extra/blas/Makefile.blas b/extra/blas/Makefile.blas
index 0c6cd06d6..7126cbb19 100644
--- a/extra/blas/Makefile.blas
+++ b/extra/blas/Makefile.blas
@@ -137,6 +137,33 @@ ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
$(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \
$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
+$(BLASLIB): $(ALLOBJ)
+ $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+ $(RANLIB) $@
+
+single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
+ $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
+ $(SBLAS2) $(SBLAS3)
+ $(RANLIB) $(BLASLIB)
+
+double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3)
+ $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(DBLAS1) $(ALLBLAS) \
+ $(DBLAS2) $(DBLAS3)
+ $(RANLIB) $(BLASLIB)
+
+complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3)
+ $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(CBLAS1) $(CB1AUX) \
+ $(ALLBLAS) $(CBLAS2) $(CBLAS3)
+ $(RANLIB) $(BLASLIB)
+
+complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
+ $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(ZBLAS1) $(ZB1AUX) \
+ $(ALLBLAS) $(ZBLAS2) $(ZBLAS3)
+ $(RANLIB) $(BLASLIB)
+
+FRC:
+ @FRC=$(FRC)
+
clean:
rm -f *.o libblas.a libblas.so*
@@ -145,5 +172,7 @@ static: $(ALLOBJ)
ranlib libblas.a
shared: $(ALLOBJ)
- cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.0 $(ALLOBJ) -lm -lgfortran -lc
+ cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.1 $(ALLOBJ) -lm -lgfortran -lc
+#.f.o:
+# $(FORTRAN) $(OPTS) -c $< -o $@
diff --git a/extra/blas/PKGBUILD b/extra/blas/PKGBUILD
index 94dd1c408..b5b65cbc5 100755
--- a/extra/blas/PKGBUILD
+++ b/extra/blas/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Jason Taylor <jftaylor21@gmail.com>
pkgname=blas
-pkgver=3.4.0
+pkgver=3.4.1
pkgrel=1
url="http://www.netlib.org/blas"
makedepends=('gcc-fortran')
@@ -16,8 +16,8 @@ license=("custom")
source=(http://www.netlib.org/lapack/lapack-${pkgver}.tgz
Makefile.blas
LICENSE.blas)
-sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f'
- '85996f56c13991fc69481c0e88ef905a0dcefb49'
+sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc'
+ 'f9eb47d6713894eaaffbf2d9b2942a777e3f5ef9'
'2491a151a37f0162b25fc4e4e9a8ac444b574a76')
build() {
@@ -29,8 +29,8 @@ build() {
pushd BLAS/SRC
make clean
- FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o
- FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared
+# FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o
+ FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" CXXFLAGS="${CXXFLAGS} -fPIC" make shared
cp libblas.so.${pkgver} "${srcdir}/lapack-${pkgver}/"
popd
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index c16e6d78d..2f57928fe 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $
+# $Id: PKGBUILD 164767 2012-08-04 18:59:21Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Mark Rosenstand <mark@archlinux.org>
pkgname=fuse
-pkgver=2.9.0
+pkgver=2.9.1
pkgrel=1
pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ backup=(etc/fuse.conf)
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
'fuse.conf')
options=(!libtool)
-sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d'
+sha1sums=('ed9e8ab740576a038856109cc587d52a387b223f'
'3b42e37a741d4651099225987dc40e7f02a716ad')
build() {
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 7c1de7797..415e603af 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -4,13 +4,15 @@
pkgbase=icedtea-web-java7
pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
pkgver=1.2.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit')
-source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6')
+source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz
+ fix_firefox_crash.diff)
+sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6'
+ '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3')
_javaver=7
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -18,6 +20,9 @@ _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
build() {
cd "${srcdir}"/icedtea-web*
+ # fix firefox crash - https://bugs.archlinux.org/task/30969
+ patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff
+
. /etc/profile.d/jre.sh
. /etc/profile.d/jdk.sh
diff --git a/extra/icedtea-web-java7/fix_firefox_crash.diff b/extra/icedtea-web-java7/fix_firefox_crash.diff
new file mode 100644
index 000000000..cd02aba0a
--- /dev/null
+++ b/extra/icedtea-web-java7/fix_firefox_crash.diff
@@ -0,0 +1,228 @@
+
+# HG changeset patch
+# User Adam Domurad <adomurad@redhat.com>
+# Date 1340899207 14400
+# Node ID a49edd57b1b332b431222b1c225189fe51676193
+# Parent d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4
+Fixes invalid plugin table error that sometimes occurs.
+The invalid plugin table error was happening when the API that was
+being compiled with had a larger size than that of the browser.
+The plugin now only checks if the minimal subset it uses exists.
+
+diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc
+--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 08 13:44:25 2012 -0400
++++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 28 12:00:07 2012 -0400
+@@ -2022,105 +2022,48 @@
+ PLUGIN_DEBUG ("plugin_data_destroy return\n");
+ }
+
+-// FACTORY FUNCTIONS
+-
+-// Provides the browser with pointers to the plugin functions that we
+-// implement and initializes a local table with browser functions that
+-// we may wish to call. Called once, after browser startup and before
+-// the first plugin instance is created.
+-// The field 'initialized' is set to true once this function has
+-// finished. If 'initialized' is already true at the beginning of
+-// this function, then it is evident that NP_Initialize has already
+-// been called. There is no need to call this function more than once and
+-// this workaround avoids any duplicate calls.
+-NPError
+-NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
++static bool
++initialize_browser_functions(const NPNetscapeFuncs* browserTable)
+ {
+- PLUGIN_DEBUG ("NP_Initialize\n");
+-
+- if ((browserTable == NULL) || (pluginTable == NULL))
++#if MOZILLA_VERSION_COLLAPSED < 1090100
++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
++#else
++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
++#endif
++
++ //Determine the size in bytes, as a difference of the address past the last used field
++ //And the browser table address
++ size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable;
++
++ // compare the reported size versus the size we required
++ if (browserTable->size < usedSize)
+ {
+- PLUGIN_ERROR ("Browser or plugin function table is NULL.");
+-
+- return NPERR_INVALID_FUNCTABLE_ERROR;
++ return false;
+ }
+
+- // Ensure that the major version of the plugin API that the browser
+- // expects is not more recent than the major version of the API that
+- // we've implemented.
+- if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
+- {
+- PLUGIN_ERROR ("Incompatible version.");
+-
+- return NPERR_INCOMPATIBLE_VERSION_ERROR;
+- }
+-
+- // Ensure that the plugin function table we've received is large
+- // enough to store the number of functions that we may provide.
+- if (pluginTable->size < sizeof (NPPluginFuncs))
+- {
+- PLUGIN_ERROR ("Invalid plugin function table.");
+-
+- return NPERR_INVALID_FUNCTABLE_ERROR;
+- }
+-
+- // Ensure that the browser function table is large enough to store
+- // the number of browser functions that we may use.
+- if (browserTable->size < sizeof (NPNetscapeFuncs))
+- {
+- fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n");
+- }
+-
+- // Store in a local table the browser functions that we may use.
+- browser_functions.size = browserTable->size;
+- browser_functions.version = browserTable->version;
+- browser_functions.geturlnotify = browserTable->geturlnotify;
+- browser_functions.geturl = browserTable->geturl;
+- browser_functions.posturlnotify = browserTable->posturlnotify;
+- browser_functions.posturl = browserTable->posturl;
+- browser_functions.requestread = browserTable->requestread;
+- browser_functions.newstream = browserTable->newstream;
+- browser_functions.write = browserTable->write;
+- browser_functions.destroystream = browserTable->destroystream;
+- browser_functions.status = browserTable->status;
+- browser_functions.uagent = browserTable->uagent;
+- browser_functions.memalloc = browserTable->memalloc;
+- browser_functions.memfree = browserTable->memfree;
+- browser_functions.memflush = browserTable->memflush;
+- browser_functions.reloadplugins = browserTable->reloadplugins;
+- browser_functions.getJavaEnv = browserTable->getJavaEnv;
+- browser_functions.getJavaPeer = browserTable->getJavaPeer;
+- browser_functions.getvalue = browserTable->getvalue;
+- browser_functions.setvalue = browserTable->setvalue;
+- browser_functions.invalidaterect = browserTable->invalidaterect;
+- browser_functions.invalidateregion = browserTable->invalidateregion;
+- browser_functions.forceredraw = browserTable->forceredraw;
+- browser_functions.getstringidentifier = browserTable->getstringidentifier;
+- browser_functions.getstringidentifiers = browserTable->getstringidentifiers;
+- browser_functions.getintidentifier = browserTable->getintidentifier;
+- browser_functions.identifierisstring = browserTable->identifierisstring;
+- browser_functions.utf8fromidentifier = browserTable->utf8fromidentifier;
+- browser_functions.intfromidentifier = browserTable->intfromidentifier;
+- browser_functions.createobject = browserTable->createobject;
+- browser_functions.retainobject = browserTable->retainobject;
+- browser_functions.releaseobject = browserTable->releaseobject;
+- browser_functions.invoke = browserTable->invoke;
+- browser_functions.invokeDefault = browserTable->invokeDefault;
+- browser_functions.evaluate = browserTable->evaluate;
+- browser_functions.getproperty = browserTable->getproperty;
+- browser_functions.setproperty = browserTable->setproperty;
+- browser_functions.removeproperty = browserTable->removeproperty;
+- browser_functions.hasproperty = browserTable->hasproperty;
+- browser_functions.hasmethod = browserTable->hasmethod;
+- browser_functions.releasevariantvalue = browserTable->releasevariantvalue;
+- browser_functions.setexception = browserTable->setexception;
+- browser_functions.pluginthreadasynccall = browserTable->pluginthreadasynccall;
+-#if MOZILLA_VERSION_COLLAPSED >= 1090100
+- browser_functions.getvalueforurl = browserTable->getvalueforurl;
+- browser_functions.setvalueforurl = browserTable->setvalueforurl;
+-#endif
+-
+- // Return to the browser the plugin functions that we implement.
++ //Ensure any unused fields are NULL
++ memset(&browser_functions, 0, sizeof(NPNetscapeFuncs));
++ //Copy fields according to given size
++ memcpy(&browser_functions, browserTable, browserTable->size);
++
++ return true;
++}
++
++/* Set the plugin table to the correct contents, taking care not to write past
++ * the provided object space */
++static bool
++initialize_plugin_table(NPPluginFuncs* pluginTable)
++{
++#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue)
++
++ //Determine the size in bytes, as a difference of the address past the last used field
++ //And the browser table address
++ size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable;
++
++ // compare the reported size versus the size we required
++ if (pluginTable->size < usedSize)
++ return false;
++
+ pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+ pluginTable->size = sizeof (NPPluginFuncs);
+
+@@ -2150,6 +2093,68 @@
+ pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
+ #endif
+
++ return true;
++}
++
++// FACTORY FUNCTIONS
++
++// Provides the browser with pointers to the plugin functions that we
++// implement and initializes a local table with browser functions that
++// we may wish to call. Called once, after browser startup and before
++// the first plugin instance is created.
++// The field 'initialized' is set to true once this function has
++// finished. If 'initialized' is already true at the beginning of
++// this function, then it is evident that NP_Initialize has already
++// been called. There is no need to call this function more than once and
++// this workaround avoids any duplicate calls.
++NPError
++NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
++{
++ PLUGIN_DEBUG ("NP_Initialize\n");
++
++ if ((browserTable == NULL) || (pluginTable == NULL))
++ {
++ PLUGIN_ERROR ("Browser or plugin function table is NULL.");
++
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++ }
++
++ // Ensure that the major version of the plugin API that the browser
++ // expects is not more recent than the major version of the API that
++ // we've implemented.
++ if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
++ {
++ PLUGIN_ERROR ("Incompatible version.");
++
++ return NPERR_INCOMPATIBLE_VERSION_ERROR;
++ }
++
++ // Copy into a global table (browser_functions) the browser functions that we may use.
++ // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED
++ // within this function
++ bool browser_functions_supported = initialize_browser_functions(browserTable);
++
++ // Check if everything we rely on is supported
++ if ( !browser_functions_supported )
++ {
++ PLUGIN_ERROR ("Invalid browser function table.");
++
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++ }
++
++ // Return to the browser the plugin functions that we implement.
++ // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
++ // within this function
++ bool plugin_functions_supported = initialize_plugin_table(pluginTable);
++
++ // Check if everything we rely on is supported
++ if ( !plugin_functions_supported )
++ {
++ PLUGIN_ERROR ("Invalid plugin function table.");
++
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++ }
++
+ // Re-setting the above tables multiple times is OK (as the
+ // browser may change its function locations). However
+ // anything beyond this point should only run once.
+
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 5ae3498ad..1d90a13db 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 164517 2012-08-01 14:21:31Z andyrtr $
+# $Id: PKGBUILD 164729 2012-08-04 08:45:39Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=icedtea-web
pkgname=('icedtea-web' 'icedtea-web-doc')
pkgver=1.2.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit')
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6')
+source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
+ fix_firefox_crash.diff)
+sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6'
+ '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3')
- _javaver=6
- _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+_javaver=6
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
build() {
cd "$srcdir/$pkgname-$pkgver"
+
+ # fix firefox crash - https://bugs.archlinux.org/task/30969
+ patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff
+
./configure --prefix=/usr/lib/jvm/java-6-openjdk \
--datarootdir=/usr/share
make
diff --git a/extra/icedtea-web/fix_firefox_crash.diff b/extra/icedtea-web/fix_firefox_crash.diff
new file mode 100644
index 000000000..cd02aba0a
--- /dev/null
+++ b/extra/icedtea-web/fix_firefox_crash.diff
@@ -0,0 +1,228 @@
+
+# HG changeset patch
+# User Adam Domurad <adomurad@redhat.com>
+# Date 1340899207 14400
+# Node ID a49edd57b1b332b431222b1c225189fe51676193
+# Parent d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4
+Fixes invalid plugin table error that sometimes occurs.
+The invalid plugin table error was happening when the API that was
+being compiled with had a larger size than that of the browser.
+The plugin now only checks if the minimal subset it uses exists.
+
+diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc
+--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 08 13:44:25 2012 -0400
++++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 28 12:00:07 2012 -0400
+@@ -2022,105 +2022,48 @@
+ PLUGIN_DEBUG ("plugin_data_destroy return\n");
+ }
+
+-// FACTORY FUNCTIONS
+-
+-// Provides the browser with pointers to the plugin functions that we
+-// implement and initializes a local table with browser functions that
+-// we may wish to call. Called once, after browser startup and before
+-// the first plugin instance is created.
+-// The field 'initialized' is set to true once this function has
+-// finished. If 'initialized' is already true at the beginning of
+-// this function, then it is evident that NP_Initialize has already
+-// been called. There is no need to call this function more than once and
+-// this workaround avoids any duplicate calls.
+-NPError
+-NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
++static bool
++initialize_browser_functions(const NPNetscapeFuncs* browserTable)
+ {
+- PLUGIN_DEBUG ("NP_Initialize\n");
+-
+- if ((browserTable == NULL) || (pluginTable == NULL))
++#if MOZILLA_VERSION_COLLAPSED < 1090100
++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall)
++#else
++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl)
++#endif
++
++ //Determine the size in bytes, as a difference of the address past the last used field
++ //And the browser table address
++ size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable;
++
++ // compare the reported size versus the size we required
++ if (browserTable->size < usedSize)
+ {
+- PLUGIN_ERROR ("Browser or plugin function table is NULL.");
+-
+- return NPERR_INVALID_FUNCTABLE_ERROR;
++ return false;
+ }
+
+- // Ensure that the major version of the plugin API that the browser
+- // expects is not more recent than the major version of the API that
+- // we've implemented.
+- if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
+- {
+- PLUGIN_ERROR ("Incompatible version.");
+-
+- return NPERR_INCOMPATIBLE_VERSION_ERROR;
+- }
+-
+- // Ensure that the plugin function table we've received is large
+- // enough to store the number of functions that we may provide.
+- if (pluginTable->size < sizeof (NPPluginFuncs))
+- {
+- PLUGIN_ERROR ("Invalid plugin function table.");
+-
+- return NPERR_INVALID_FUNCTABLE_ERROR;
+- }
+-
+- // Ensure that the browser function table is large enough to store
+- // the number of browser functions that we may use.
+- if (browserTable->size < sizeof (NPNetscapeFuncs))
+- {
+- fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n");
+- }
+-
+- // Store in a local table the browser functions that we may use.
+- browser_functions.size = browserTable->size;
+- browser_functions.version = browserTable->version;
+- browser_functions.geturlnotify = browserTable->geturlnotify;
+- browser_functions.geturl = browserTable->geturl;
+- browser_functions.posturlnotify = browserTable->posturlnotify;
+- browser_functions.posturl = browserTable->posturl;
+- browser_functions.requestread = browserTable->requestread;
+- browser_functions.newstream = browserTable->newstream;
+- browser_functions.write = browserTable->write;
+- browser_functions.destroystream = browserTable->destroystream;
+- browser_functions.status = browserTable->status;
+- browser_functions.uagent = browserTable->uagent;
+- browser_functions.memalloc = browserTable->memalloc;
+- browser_functions.memfree = browserTable->memfree;
+- browser_functions.memflush = browserTable->memflush;
+- browser_functions.reloadplugins = browserTable->reloadplugins;
+- browser_functions.getJavaEnv = browserTable->getJavaEnv;
+- browser_functions.getJavaPeer = browserTable->getJavaPeer;
+- browser_functions.getvalue = browserTable->getvalue;
+- browser_functions.setvalue = browserTable->setvalue;
+- browser_functions.invalidaterect = browserTable->invalidaterect;
+- browser_functions.invalidateregion = browserTable->invalidateregion;
+- browser_functions.forceredraw = browserTable->forceredraw;
+- browser_functions.getstringidentifier = browserTable->getstringidentifier;
+- browser_functions.getstringidentifiers = browserTable->getstringidentifiers;
+- browser_functions.getintidentifier = browserTable->getintidentifier;
+- browser_functions.identifierisstring = browserTable->identifierisstring;
+- browser_functions.utf8fromidentifier = browserTable->utf8fromidentifier;
+- browser_functions.intfromidentifier = browserTable->intfromidentifier;
+- browser_functions.createobject = browserTable->createobject;
+- browser_functions.retainobject = browserTable->retainobject;
+- browser_functions.releaseobject = browserTable->releaseobject;
+- browser_functions.invoke = browserTable->invoke;
+- browser_functions.invokeDefault = browserTable->invokeDefault;
+- browser_functions.evaluate = browserTable->evaluate;
+- browser_functions.getproperty = browserTable->getproperty;
+- browser_functions.setproperty = browserTable->setproperty;
+- browser_functions.removeproperty = browserTable->removeproperty;
+- browser_functions.hasproperty = browserTable->hasproperty;
+- browser_functions.hasmethod = browserTable->hasmethod;
+- browser_functions.releasevariantvalue = browserTable->releasevariantvalue;
+- browser_functions.setexception = browserTable->setexception;
+- browser_functions.pluginthreadasynccall = browserTable->pluginthreadasynccall;
+-#if MOZILLA_VERSION_COLLAPSED >= 1090100
+- browser_functions.getvalueforurl = browserTable->getvalueforurl;
+- browser_functions.setvalueforurl = browserTable->setvalueforurl;
+-#endif
+-
+- // Return to the browser the plugin functions that we implement.
++ //Ensure any unused fields are NULL
++ memset(&browser_functions, 0, sizeof(NPNetscapeFuncs));
++ //Copy fields according to given size
++ memcpy(&browser_functions, browserTable, browserTable->size);
++
++ return true;
++}
++
++/* Set the plugin table to the correct contents, taking care not to write past
++ * the provided object space */
++static bool
++initialize_plugin_table(NPPluginFuncs* pluginTable)
++{
++#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue)
++
++ //Determine the size in bytes, as a difference of the address past the last used field
++ //And the browser table address
++ size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable;
++
++ // compare the reported size versus the size we required
++ if (pluginTable->size < usedSize)
++ return false;
++
+ pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+ pluginTable->size = sizeof (NPPluginFuncs);
+
+@@ -2150,6 +2093,68 @@
+ pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
+ #endif
+
++ return true;
++}
++
++// FACTORY FUNCTIONS
++
++// Provides the browser with pointers to the plugin functions that we
++// implement and initializes a local table with browser functions that
++// we may wish to call. Called once, after browser startup and before
++// the first plugin instance is created.
++// The field 'initialized' is set to true once this function has
++// finished. If 'initialized' is already true at the beginning of
++// this function, then it is evident that NP_Initialize has already
++// been called. There is no need to call this function more than once and
++// this workaround avoids any duplicate calls.
++NPError
++NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
++{
++ PLUGIN_DEBUG ("NP_Initialize\n");
++
++ if ((browserTable == NULL) || (pluginTable == NULL))
++ {
++ PLUGIN_ERROR ("Browser or plugin function table is NULL.");
++
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++ }
++
++ // Ensure that the major version of the plugin API that the browser
++ // expects is not more recent than the major version of the API that
++ // we've implemented.
++ if ((browserTable->version >> 8) > NP_VERSION_MAJOR)
++ {
++ PLUGIN_ERROR ("Incompatible version.");
++
++ return NPERR_INCOMPATIBLE_VERSION_ERROR;
++ }
++
++ // Copy into a global table (browser_functions) the browser functions that we may use.
++ // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED
++ // within this function
++ bool browser_functions_supported = initialize_browser_functions(browserTable);
++
++ // Check if everything we rely on is supported
++ if ( !browser_functions_supported )
++ {
++ PLUGIN_ERROR ("Invalid browser function table.");
++
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++ }
++
++ // Return to the browser the plugin functions that we implement.
++ // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED
++ // within this function
++ bool plugin_functions_supported = initialize_plugin_table(pluginTable);
++
++ // Check if everything we rely on is supported
++ if ( !plugin_functions_supported )
++ {
++ PLUGIN_ERROR ("Invalid plugin function table.");
++
++ return NPERR_INVALID_FUNCTABLE_ERROR;
++ }
++
+ // Re-setting the above tables multiple times is OK (as the
+ // browser may change its function locations). However
+ // anything beyond this point should only run once.
+
diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack
index 3443d7000..a56436723 100644
--- a/extra/lapack/Makefile.lapack
+++ b/extra/lapack/Makefile.lapack
@@ -1,4 +1,4 @@
-include ../make.inc
+ include ../make.inc
#######################################################################
# This is the makefile to create a library for LAPACK.
@@ -135,10 +135,12 @@ SLASRC = \
ssbtrd.o sspcon.o sspev.o sspevd.o sspevx.o sspgst.o \
sspgv.o sspgvd.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \
ssptrf.o ssptri.o ssptrs.o sstegr.o sstein.o sstev.o sstevd.o sstevr.o \
- sstevx.o ssycon.o ssyev.o ssyevd.o ssyevr.o ssyevx.o ssygs2.o \
+ sstevx.o \
+ ssycon.o ssyev.o ssyevd.o ssyevr.o ssyevx.o ssygs2.o \
ssygst.o ssygv.o ssygvd.o ssygvx.o ssyrfs.o ssysv.o ssysvx.o \
ssytd2.o ssytf2.o ssytrd.o ssytrf.o ssytri.o ssytri2.o ssytri2x.o \
- ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o stbcon.o \
+ ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o \
+ stbcon.o \
stbrfs.o stbtrs.o stgevc.o stgex2.o stgexc.o stgsen.o \
stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \
stptrs.o \
@@ -208,9 +210,11 @@ CLASRC = \
cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o cpttrs.o cptts2.o \
crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \
cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \
- cstegr.o cstein.o csteqr.o csycon.o csymv.o \
- csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
- csyswapr.o csytrs.o csytrs2.o csyconv.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
+ cstegr.o cstein.o csteqr.o \
+ csycon.o csymv.o \
+ csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
+ csyswapr.o csytrs.o csytrs2.o csyconv.o \
+ ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \
ctprfs.o ctptri.o \
ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \
@@ -283,12 +287,13 @@ DLASRC = \
dsbtrd.o dspcon.o dspev.o dspevd.o dspevx.o dspgst.o \
dspgv.o dspgvd.o dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o \
dsptrf.o dsptri.o dsptrs.o dstegr.o dstein.o dstev.o dstevd.o dstevr.o \
- dstevx.o dsycon.o dsyev.o dsyevd.o dsyevr.o \
+ dstevx.o \
+ dsycon.o dsyev.o dsyevd.o dsyevr.o \
dsyevx.o dsygs2.o dsygst.o dsygv.o dsygvd.o dsygvx.o dsyrfs.o \
dsysv.o dsysvx.o \
dsytd2.o dsytf2.o dsytrd.o dsytrf.o dsytri.o dsytri2.o dsytri2x.o \
- dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o dtbcon.o \
- dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
+ dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o \
+ dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \
dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
dtptrs.o \
dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
@@ -359,9 +364,11 @@ ZLASRC = \
zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o zpttrs.o zptts2.o \
zrot.o zspcon.o zspmv.o zspr.o zsprfs.o zspsv.o \
zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \
- zstegr.o zstein.o zsteqr.o zsycon.o zsymv.o \
- zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
- zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \
+ zstegr.o zstein.o zsteqr.o \
+ zsycon.o zsymv.o \
+ zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
+ zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o \
+ ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \
ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \
ztprfs.o ztptri.o \
ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
@@ -391,14 +398,57 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
endif
+ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
+ $(SCLAUX) $(DZLAUX) $(ALLAUX)
+
+ifdef USEXBLAS
+ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
+endif
+
all: ../$(LAPACKLIB)
+../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
+ $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
+ $(RANLIB) $@
+
+single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
+ $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
+ $(SXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
+ $(RANLIB) ../$(LAPACKLIB)
+
+complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
+ $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
+ $(CXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
+ $(RANLIB) ../$(LAPACKLIB)
+
+double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
+ $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
+ $(DXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
+ $(RANLIB) ../$(LAPACKLIB)
+
+complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
+ $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
+ $(ZXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
+ $(RANLIB) ../$(LAPACKLIB)
+
+$(ALLAUX): $(FRC)
+$(SCLAUX): $(FRC)
+$(DZLAUX): $(FRC)
+$(SLASRC): $(FRC)
+$(CLASRC): $(FRC)
+$(DLASRC): $(FRC)
+$(ZLASRC): $(FRC)
+$(ZCLASRC): $(FRC)
+$(DSLASRC): $(FRC)
ifdef USEXBLAS
-ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX)
+$(SXLASRC): $(FRC)
+$(CXLASRC): $(FRC)
+$(DXLASRC): $(FRC)
+$(ZXLASRC): $(FRC)
endif
-ALLOBJ=$(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
- $(SCLAUX) $(DZLAUX) $(ALLAUX)
+FRC:
+ @FRC=$(FRC)
clean:
rm -f *.o liblapack*
@@ -408,4 +458,4 @@ static: $(ALLOBJ) $(ALLXOBJ)
ranlib liblapack.a
shared: $(ALLOBJ) $(ALLXOBJ)
- cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.0 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
+ cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index cef5ff2f7..df8aa17cd 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147948 2012-01-28 21:21:33Z ronald $
+# $Id: PKGBUILD 164763 2012-08-04 18:50:35Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Jason Taylor <jftaylor21@gmail.com>
pkgname=lapack
-pkgver=3.4.0
+pkgver=3.4.1
pkgrel=1
url="http://www.netlib.org/lapack"
pkgdesc="Linear Algebra PACKage"
@@ -52,3 +52,5 @@ package() {
"${pkgdir}/usr/share/licenses/lapack/"
}
+sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc'
+ '4ea739a743e2de248ad150873137432261d5b630')
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index a9796f0b5..ffdbb3d13 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -1,25 +1,35 @@
-# $Id: PKGBUILD 119963 2011-04-17 22:11:07Z remy $
+# $Id: PKGBUILD 164721 2012-08-04 06:54:39Z remy $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=latex2rtf
-pkgver=2.1.0
+pkgver=2.2.1c
pkgrel=1
pkgdesc="LaTeX to RTF converter"
arch=('i686' 'x86_64')
url="http://latex2rtf.sourceforge.net/"
license=('GPL')
depends=('glibc' 'imagemagick' 'ghostscript')
+checkdepends=(
+ 'texlive-bin'
+ 'texlive-core'
+ 'texlive-latexextra' # for a4wide package
+)
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('31e6280312b56c2c38cf6a3fddff21a9910c7d6f')
+sha1sums=('3fd5874de8988cf45f8862d2b3db8ed13a04caa4')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make PREFIX=/usr
+ cd "${srcdir}/${pkgname}-2.2.1"
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-2.2.1"
+ make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make PREFIX=${pkgdir}/usr MAN_INSTALL=${pkgdir}/usr/share/man/man1 install
+ cd "${srcdir}/${pkgname}-2.2.1"
+ make DESTDIR=${pkgdir}/usr install
sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png
}
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 5ca0a390f..87fc70c20 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163711 2012-07-18 01:05:51Z ibiru $
+# $Id: PKGBUILD 164769 2012-08-04 19:30:05Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
-pkgver=2.0.3
-pkgrel=4
+pkgver=2.0.4
+pkgrel=1
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('i686' 'x86_64')
url="http://www.lyx.org"
@@ -18,7 +18,7 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
backup=('etc/lyx/lyxrc.dist')
install=lyx.install
options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
+sha1sums=('4d384060553c74912e13f98e1788a6f978c58c2e'
'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
'56416642cc3da2a13b87b84e6b87c1a239f3d09a')
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index bcf8fbb80..73d430778 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163155 2012-07-08 09:31:52Z ibiru $
+# $Id: PKGBUILD 164751 2012-08-04 17:46:43Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=miro
-pkgver=5.0.1
-pkgrel=2
+pkgver=5.0.2
+pkgrel=1
pkgdesc="The free and open source internet TV platform"
arch=('i686' 'x86_64')
url="http://www.getmiro.com"
@@ -18,7 +18,7 @@ makedepends=('pkg-config' 'boost')
install=miro.install
source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
'ffmpeg.patch')
-sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa'
+sha1sums=('67babcf76cc08b72b8f55d425b1372ae0a979805'
'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
build() {
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index f8af21be8..3e8184e81 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 153792 2012-03-19 18:12:16Z stephane $
+# $Id: PKGBUILD 164757 2012-08-04 18:04:50Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
-pkgbase=nasm
-pkgname=('nasm' 'nasm-doc')
-pkgver=2.10
+pkgname=nasm
+pkgver=2.10.03
pkgrel=1
-arch=('i686' 'x86_64')
+pkgdesc="An 80x86 assembler designed for portability and modularity"
url="http://www.nasm.us"
license=('BSD')
+arch=('i686' 'x86_64')
+depends=('glibc')
makedepends=('ghostscript')
-source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('acdcae5366230e2e19b2ad36f952df0232c80950')
+source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('78a8de9ba02da7c2ba8c583a57901ff6856ad6c6')
+install=nasm.install
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -19,24 +21,10 @@ build() {
make everything
}
-package_nasm() {
- pkgdesc="An 80x86 assembler designed for portability and modularity"
- depends=('glibc')
- install=nasm.install
-
+package() {
cd "${srcdir}/${pkgbase}-${pkgver}"
make INSTALLROOT="${pkgdir}" install install_rdf
- install -d "${pkgdir}"/usr/share/info
+ install -dm755 "${pkgdir}"/usr/share/info
install -m644 doc/info/* "${pkgdir}"/usr/share/info/
install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/nasm/LICENSE
}
-
-package_nasm-doc() {
- pkgdesc="An 80x86 assembler designed for portability and modularity (manuals)"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/doc"
- install -d "${pkgdir}"/usr/share/doc/nasm/html
- install -m644 html/* "${pkgdir}"/usr/share/doc/nasm/html/
- install -m644 nasmdoc.ps nasmdoc.pdf nasmdoc.txt "${pkgdir}"/usr/share/doc/nasm/
- install -D -m644 ../LICENSE "${pkgdir}"/usr/share/licenses/nasm-doc/LICENSE
-}
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index 1689779ab..dc0109641 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 148908 2012-02-05 11:55:28Z ibiru $
+# $Id: PKGBUILD 164771 2012-08-04 20:28:32Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir.archlinux.org>
# Contributor: Gergely Imreh <imrehg@gmail.com>
pkgname=qtiplot
-pkgver=0.9.8.8
-pkgrel=2
+pkgver=0.9.8.9
+pkgrel=1
arch=('i686' 'x86_64')
url="http://soft.proindependent.com/qtiplot.html"
pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
+depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
# build against qwtplot3d provided in the package ...
# build against qwt provided in the package ...
# as systemwide one doesn't provide all needed functions
@@ -27,7 +27,7 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
qtiplot-0.9.8.6-tamuanova.patch
qwtplot3d-qt-4.8.0.patch
qwtplot3d-libpng15.patch)
-sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48'
+sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30'
'4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
'4301cb2a36024a10108b689990d28c4fe5c7416e'
'326ee6bc623a637d058ab7ee9f65fede40a23a09'
@@ -92,5 +92,3 @@ package() {
install -D -m644 "${srcdir}/${pkgname}.xml" \
"${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
}
-
-
diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD
index ab9b16cd1..2d54663e3 100644
--- a/extra/suitesparse/PKGBUILD
+++ b/extra/suitesparse/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153722 2012-03-18 17:12:55Z ronald $
+# $Id: PKGBUILD 164773 2012-08-04 20:35:22Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=suitesparse
-pkgver=3.7.0
+pkgver=4.0.2
pkgrel=1
pkgdesc="A collection of sparse matrix libraries"
url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
@@ -14,14 +14,14 @@ depends=('blas' 'lapack')
makedepends=('gcc-fortran')
license=('GPL')
source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz)
-sha1sums=('d0eb24b43ee2f7def032e80eaa7a589f94f546fc')
+sha1sums=('46b24a28eef4b040ea5a02d2c43e82e28b7d6195')
build() {
cd "$srcdir"/SuiteSparse
export CFLAGS=" ${CFLAGS} -DNPARTITION"
- make -C UFconfig/xerbla
- make -C UFconfig
+ make -C SuiteSparse_config/xerbla
+ make -C SuiteSparse_config
for _lib in AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do
make -C ${_lib} library
done
@@ -32,7 +32,7 @@ package() {
cd "${srcdir}"/SuiteSparse
install -dm755 "${pkgdir}"/usr/{lib,include}
- for _lib in UFconfig AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do
+ for _lib in SuiteSparse_config AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do
make -C ${_lib} INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install
done
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index 88eb1559e..1e8fc0fff 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 151204 2012-02-25 07:32:54Z allan $
+# $Id: PKGBUILD 164737 2012-08-04 10:47:06Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Orivej Desh <smpuj@bk.ru>
pkgname=vamp-plugin-sdk
-pkgver=2.2
-pkgrel=2
+pkgver=2.4
+pkgrel=1
pkgdesc="The Vamp audio analysis plug-in system"
arch=('i686' 'x86_64')
url="http://www.vamp-plugins.org/"
license=('BSD')
depends=('gcc-libs' 'libsndfile')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz"
- 'gcc44.patch')
-md5sums=('037cdb83f20a331ff1fa07d54550c773'
- 'a07e3ef9c657a56cf2e8c4afc0ba1cec')
+#options=('!libtool')
+source=("http://code.soundsoftware.ac.uk/attachments/download/517/$pkgname-$pkgver.tar.gz")
+md5sums=('4bd75ca4515c141cd8776bdb59066261')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 1404df7f8..f534ac848 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163786 2012-07-20 05:22:44Z giovanni $
+# $Id: PKGBUILD 164719 2012-08-04 05:32:21Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
pkgver=2.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
@@ -63,6 +63,7 @@ build() {
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
./configure --prefix=/usr \
+ --sysconfdir=/etc \
--disable-rpath \
--enable-oss \
--enable-faad \
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index 55b8ca2c6..ae28528a2 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164024 2012-07-24 15:40:48Z andyrtr $
+# $Id: PKGBUILD 164779 2012-08-04 21:22:47Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <Alexander@archlinux.org
pkgname=xf86-input-evdev
-pkgver=2.7.1
+pkgver=2.7.2
pkgrel=1
pkgdesc="X.org evdev input driver"
arch=(i686 x86_64)
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.11.99.902')
options=('!libtool' '!makeflags')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1c128bbd34bc17d08cc723c2429cdfe7efc426cb753e38189ffd290002a3b598')
+sha256sums=('ef729a0e4623e278e1d18801a6c3e4565f108bfa2546fa79333f8a731cfdd1dc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-07 03:42:57 +0000