Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2017-02-15 23:27:25 +03:00
parent fea745efbb 01168ef295
commit 2e4a50dd78
42 changed files with 868 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/graphics/GraphicsMagick/pspec.xml
+7
View File
@@ -98,6 +98,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-15</Date>
<Version>1.3.25</Version>
<Comment>Rebuild.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-06</Date>
<Version>1.3.25</Version>
multimedia/graphics/enblend/actions.py
+1 -1
View File
@@ -18,4 +18,4 @@ def build():
def install():
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README")
pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README")
multimedia/graphics/enblend/files/enblend-4.1.4-gcc6.patch
+90
View File
@@ -0,0 +1,90 @@
diff -r 6aec0cc8d22a -r 467a73754dbb include/vigra_ext/impexalpha.hxx
--- a/include/vigra_ext/impexalpha.hxx Mon Sep 28 09:41:56 2015 +0200
+++ b/include/vigra_ext/impexalpha.hxx Sun Jan 24 17:05:51 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Christoph L. Spiel
+ * Copyright (C) 2012-2016 Christoph L. Spiel
*
* This file is part of Enblend.
*
@@ -26,6 +26,9 @@
#include <vigra/imageinfo.hxx>
#include <vigra/impex.hxx>
+#ifndef VIGRA_UNIQUE_PTR
+#define VIGRA_UNIQUE_PTR std::auto_ptr
+#endif
namespace vigra_ext
{
@@ -194,7 +197,7 @@
AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
vigra::VigraTrueType)
{
- std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
+ VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
switch (pixel_t_of_string(decoder->getPixelType()))
{
@@ -249,7 +252,7 @@
AlphaIterator alpha_iterator, AlphaAccessor alpha_accessor,
vigra::VigraFalseType)
{
- std::auto_ptr<vigra::Decoder> decoder(vigra::decoder(import_info));
+ VIGRA_UNIQUE_PTR<vigra::Decoder> decoder(vigra::decoder(import_info));
switch (pixel_t_of_string(decoder->getPixelType()))
{
@@ -467,7 +470,7 @@
vigra::VigraTrueType)
{
const std::string pixel_type(export_info.getPixelType());
- std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
+ VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
encoder->setPixelType(pixel_type);
@@ -525,7 +528,7 @@
vigra::VigraFalseType)
{
const std::string pixel_type(export_info.getPixelType());
- std::auto_ptr<vigra::Encoder> encoder(vigra::encoder(export_info));
+ VIGRA_UNIQUE_PTR<vigra::Encoder> encoder(vigra::encoder(export_info));
encoder->setPixelType(pixel_type);
diff -r 596efbff27a8 -r 73e6f16de80a src/filespec.cc
--- a/src/filespec.cc Sun Jan 24 17:06:09 2016 +0100
+++ b/src/filespec.cc Mon Feb 15 10:20:30 2016 +0100
@@ -37,7 +37,6 @@
#include <cctype>
#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/assign/list_of.hpp>
#include <vigra/imageinfo.hxx>
@@ -412,17 +411,12 @@
public:
Globbing() : algorithm_name_("literal"), algorithm_(NULL)
{
- installed_algorithms_ =
- boost::assign::map_list_of
- ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm))
- ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm))
+ installed_algorithms_["literal"] = MAKE_ALGORITHM(new LiteralGlobbingAlgorithm);
+ installed_algorithms_["wildcard"] = MAKE_ALGORITHM(new WildcardGlobbingAlgorithm);
+ setup_alias("literal", "none");
+
#ifndef _WIN32
- ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm))
-#endif
- ;
-
- setup_alias("literal", "none");
-#ifndef _WIN32
+ installed_algorithms_["shell"] = MAKE_ALGORITHM(new ShellGlobbingAlgorithm);
setup_alias("shell", "sh");
#endif
}
multimedia/graphics/enblend/pspec.xml
+9
View File
@@ -24,9 +24,11 @@
<Dependency>libpng-devel</Dependency>
<Dependency>openexr-devel</Dependency>
<Dependency>imagemagick-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gentoo_prepare.patch</Patch>
<Patch level="1">enblend-4.1.4-gcc6.patch</Patch>
</Patches>
</Source>
@@ -49,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>4.1.3</Version>
<Comment>Rebuild for new toolchain.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>4.1.3</Version>
multimedia/graphics/hugin/actions.py
+12 -1
View File
@@ -10,13 +10,24 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
-DENABLE_LAPACK=yes")
-DENABLE_LAPACK=yes", sourceDir="..")
def build():
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.make()
def install():
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.rawInstall('DESTDIR="%s"' % get.installDIR())
shelltools.cd("..")
pisitools.dodoc("AUTHORS", "README", "TODO")
multimedia/graphics/hugin/pspec.xml
+9 -1
View File
@@ -14,7 +14,7 @@
<IsA>library</IsA>
<Summary>A panoramic photo stitcher</Summary>
<Description>hugin can be used to stitch multiple images together. The resulting image can span 360 degrees. Another common use is the creation of very high resolution pictures by combining multiple images.</Description>
<Archive sha1sum="be7153a0791f2147153e93e8711912ef23b60b61" type="tarbz2">mirrors://sourceforge/hugin/hugin/hugin-2015.0/hugin-2015.0.0.tar.bz2</Archive>
<Archive sha1sum="9d28609d973fa72b95b1e2506cf1de7d24578e67" type="tarbz2">mirrors://sourceforge/hugin/hugin/hugin-2016.2/hugin-2016.2.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>swig</Dependency>
<Dependency>cmake</Dependency>
@@ -24,6 +24,7 @@
<Dependency>vigra-devel</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency>wxGTK-devel</Dependency>
<Dependency>lcms2-devel</Dependency>
<Dependency>exiv2-devel</Dependency>
<Dependency>fftw3-devel</Dependency>
<Dependency>flann-devel</Dependency>
@@ -92,6 +93,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>2016.2.0</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2015.0.0</Version>
multimedia/graphics/imagemagick/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A collection of tools and libraries for many image file formats</Summary>
<Description>ImageMagick is a software suite to create, edit, and compose bitmap images. It can read, convert and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. You can use ImageMagick to translate, flip, mirror, rotate, scale, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.</Description>
<Archive sha1sum="6d8768e869f8be010bc5ad5f88a54ebf4cc0a954" type="tarxz">ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-7.0.3-5.tar.xz</Archive>
<Archive sha1sum="a552b537e77139a56f12d196930212c9a70d8202" type="tarxz">ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-7.0.4-9.tar.xz</Archive>
<BuildDependencies>
<Dependency>ghostscript-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
@@ -31,7 +31,7 @@
<Dependency>libpng-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="0">perlmagick.rpath.patch</Patch>
<!-- <Patch level="0">perlmagick.rpath.patch</Patch> -->
</Patches>
</Source>
@@ -93,6 +93,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-15</Date>
<Version>7.0.4.9</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-06</Date>
<Version>7.0.3.5</Version>
multimedia/misc/DirectFB/pspec.xml
+7
View File
@@ -87,6 +87,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>1.7.7</Version>
<Comment>Rebuild for new toolchain</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.7.7</Version>
multimedia/misc/gd/actions.py
+1 -1
View File
@@ -26,4 +26,4 @@ def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dohtml(".")
pisitools.dodoc("COPYING", "NEWS", "ChangeLog")
pisitools.dodoc("COPYING", "README*")
multimedia/misc/gd/files/gd-2.1.0-multilib.patch
+34
View File
@@ -0,0 +1,34 @@
diff -up gd-2.1.0/config/gdlib-config.in.multilib gd-2.1.0/config/gdlib-config.in
--- gd-2.1.0/config/gdlib-config.in.multilib 2013-04-21 16:58:17.820010758 +0200
+++ gd-2.1.0/config/gdlib-config.in 2013-04-21 16:59:27.896317922 +0200
@@ -7,9 +7,10 @@
# installation directories
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=`pkg-config gdlib --variable=libdir`
includedir=@includedir@
bindir=@bindir@
+ldflags=`pkg-config gdlib --variable=ldflags`
usage()
{
@@ -68,7 +69,7 @@ while test $# -gt 0; do
echo @GDLIB_REVISION@
;;
--ldflags)
- echo @LDFLAGS@
+ echo $ldflags
;;
--libs)
echo -lgd @LIBS@ @LIBICONV@
@@ -83,7 +84,7 @@ while test $# -gt 0; do
echo "GD library @VERSION@"
echo "includedir: $includedir"
echo "cflags: -I@includedir@"
- echo "ldflags: @LDFLAGS@"
+ echo "ldflags: $ldflags"
echo "libs: @LIBS@ @LIBICONV@"
echo "libdir: $libdir"
echo "features: @FEATURES@"
multimedia/misc/gd/files/gd-2.2.3-tests.patch
+42
View File
@@ -0,0 +1,42 @@
From 2b3dd57a6ccb2940f2e9119ae04e14362e2a1f61 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 22 Jul 2016 08:14:12 +0200
Subject: [PATCH] Fix gd2/gd2_read.c:8:6: error: 'error' may be used
uninitialized in this function [-Werror=maybe-uninitialized]
Also report about any error, not only the last one.
---
tests/gd2/gd2_read.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/gd2/gd2_read.c b/tests/gd2/gd2_read.c
index 94fe069..8ce8bd1 100644
--- a/tests/gd2/gd2_read.c
+++ b/tests/gd2/gd2_read.c
@@ -5,7 +5,7 @@
int main(int argc, char *argv[])
{
- int error, i = 0;
+ int error = 0, i = 0;
gdImagePtr im, exp;
FILE *fp;
char *path[] = {
@@ -40,8 +40,6 @@ int main(int argc, char *argv[])
gdTestErrorMsg("image %s differs from expected result\n", path[i]);
gdImageDestroy(im);
error = 1;
- } else {
- error = 0;
}
if (exp) {
gdImageDestroy(exp);
@@ -52,8 +50,6 @@ int main(int argc, char *argv[])
gdTestErrorMsg("image %s should have failed to be loaded\n", path[i]);
gdImageDestroy(im);
error = 1;
- } else {
- error = 0;
}
}
i++;
multimedia/misc/gd/files/gd-2.2.4-upstream.patch
+51
View File
@@ -0,0 +1,51 @@
From c9b601a658a79e6ea2aad29fbf60ca6e24ccef1e Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 18 Jan 2017 13:59:02 +0100
Subject: [PATCH] Fix build issue regarding INT_MAX
For portability gd_gd2.c needs to include <limits.h>.
---
src/gd_gd2.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/gd_gd2.c b/src/gd_gd2.c
index c2904ca..049c4c5 100644
--- a/src/gd_gd2.c
+++ b/src/gd_gd2.c
@@ -74,6 +74,7 @@
/* 2.0.29: no more errno.h, makes windows happy */
#include <math.h>
+#include <limits.h>
#include <string.h>
#include "gd.h"
#include "gd_errors.h"
From 55ac28a293eaa8c531870c8bb8ecc04b333975f4 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Thu, 19 Jan 2017 01:02:58 +0100
Subject: [PATCH] Fix #357: 2.2.4: Segfault in test suite.
We make sure to never pass a negative `int` as argument to a `size_t`
parameter.
---
src/gd_io_dp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/gd_io_dp.c b/src/gd_io_dp.c
index eda2eeb..cb38794 100644
--- a/src/gd_io_dp.c
+++ b/src/gd_io_dp.c
@@ -292,6 +292,10 @@ static int dynamicGetbuf(gdIOCtxPtr ctx, void *buf, int len)
rlen = dp->realSize - dp->pos;
}
+ if (rlen < 0) {
+ return 0;
+ }
+
memcpy(buf, (void *) ((char *)dp->data + dp->pos), rlen);
dp->pos += rlen;
multimedia/misc/gd/pspec.xml
+13 -2
View File
@@ -13,7 +13,8 @@
<IsA>library</IsA>
<Summary>A fast library for creating graphic images</Summary>
<Description>The gd graphics library allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from other images, and flood fills, and to write out the result as a PNG or JPEG file. This is particularly useful in Web applications, where PNG and JPEG are two of the formats accepted for inline images by most browsers. Note that gd is not a paint program.</Description>
<Archive sha1sum="b089ee7fc0b47b8aa4c2c70087506806637f03be" type="targz">https://github.com/libgd/libgd/archive/gd-2.1.1.tar.gz</Archive> <BuildDependencies>
<Archive sha1sum="67779817d7aecb94594c43ace949af350ca1df7f" type="tarxz">https://github.com/libgd/libgd/releases/download/gd-2.2.4/libgd-2.2.4.tar.xz</Archive>
<BuildDependencies>
<Dependency>fontconfig-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>freetype-devel</Dependency>
@@ -23,7 +24,10 @@
<Dependency>libvpx-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>gd-2.1.1-libvpx-1.4.0.patch</Patch>
<!-- <Patch>gd-2.1.1-libvpx-1.4.0.patch</Patch> -->
<Patch level="1">gd-2.1.0-multilib.patch</Patch>
<Patch level="1">gd-2.2.3-tests.patch</Patch>
<Patch level="1">gd-2.2.4-upstream.patch</Patch>
</Patches>
</Source>
@@ -67,6 +71,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>2.2.4</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-12</Date>
<Version>2.1.1</Version>
multimedia/misc/jansson/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Jansson is a C library for encoding, decoding and manipulating JSON data.</Summary>
<Description>It features: Simple and intuitive API and data model, Comprehensive documentation, No dependencies on other libraries, Full Unicode support (UTF-8), Extensive test suite.</Description>
<Archive sha1sum="51cd3b57f152132de686bb8c1f4471cc9ca7970e" type="tarbz2">http://www.digip.org/jansson/releases/jansson-2.7.tar.bz2</Archive>
<Archive sha1sum="d8c04a344c37afff17cd17ffb3ca2a8a08c1eafc" type="tarbz2">http://www.digip.org/jansson/releases/jansson-2.9.tar.bz2</Archive>
<BuildDependencies>
<Dependency>glibc-devel</Dependency>
</BuildDependencies>
@@ -46,6 +46,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>2.9</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2.7</Version>
multimedia/misc/libass/pspec.xml
+17 -10
View File
@@ -12,20 +12,20 @@
<IsA>library</IsA>
<Summary>Subtitle rendering library</Summary>
<Description>libass is a portable subtitle rendering library for the ASS/SSA.</Description>
<Archive sha1sum="a48a5d160f0644423f1baa66f88aae8fe24c9487" type="tarxz">https://github.com/libass/libass/releases/download/0.13.1/libass-0.13.1.tar.xz</Archive>
<Archive sha1sum="c11da6214fdbbaaf145862d215a77fa243126e3e" type="tarxz">https://github.com/libass/libass/releases/download/0.13.6/libass-0.13.6.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="2.11">fontconfig-devel</Dependency>
<Dependency versionFrom="2.5.5">freetype-devel</Dependency>
<Dependency versionFrom="0.19">fribidi-devel</Dependency>
<Dependency versionFrom="2.12.1">fontconfig-devel</Dependency>
<Dependency versionFrom="2.7.1">freetype-devel</Dependency>
<Dependency versionFrom="0.19.7">fribidi-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libass</Name>
<RuntimeDependencies>
<Dependency versionFrom="2.11">fontconfig</Dependency>
<Dependency versionFrom="2.5.5">freetype</Dependency>
<Dependency versionFrom="0.19">fribidi</Dependency>
<Dependency versionFrom="2.12.1">fontconfig</Dependency>
<Dependency versionFrom="2.7.1">freetype</Dependency>
<Dependency versionFrom="0.19.7">fribidi</Dependency>
<Dependency>harfbuzz</Dependency>
</RuntimeDependencies>
<Files>
@@ -39,9 +39,9 @@
<Summary>Development files for libass</Summary>
<RuntimeDependencies>
<Dependency release="current">libass</Dependency>
<Dependency versionFrom="2.11">fontconfig-devel</Dependency>
<Dependency versionFrom="2.5.5">freetype-devel</Dependency>
<Dependency versionFrom="0.19">fribidi-devel</Dependency>
<Dependency versionFrom="2.12.1">fontconfig-devel</Dependency>
<Dependency versionFrom="2.7.1">freetype-devel</Dependency>
<Dependency versionFrom="0.19.7">fribidi-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency>
</RuntimeDependencies>
<Files>
@@ -51,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>0.13.6</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.13.1</Version>
multimedia/misc/libbluray/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Library to access Blu-Ray disks for video playback</Summary>
<Description>Libbluray package is aiming to provide a full portable free open source bluray library, which can be plugged into popular media players to allow full bluray navigation and playback on Linux. It will eventually be compatible with all current titles, and will be easily portable and embeddable in standard players such as mplayer and vlc.</Description>
<Archive sha1sum="34eedb13e220eb88a5f58660bdb4e727e775fc83" type="tarbz2">ftp://ftp.videolan.org/pub/videolan/libbluray/0.9.2/libbluray-0.9.2.tar.bz2</Archive>
<Archive sha1sum="0d993610b2bd4b69d98828f69675aa613d870798" type="tarbz2">ftp://ftp.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libtool</Dependency>
<Dependency>doxygen</Dependency>
@@ -60,6 +60,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>0.9.3</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.9.2</Version>
multimedia/misc/libcdr/pspec.xml
+8 -1
View File
@@ -14,7 +14,7 @@
<IsA>library</IsA>
<Summary>Library parsing the Corel cdr documents</Summary>
<Description>Libcdr is library providing ability to interpret and import Corel Draw drawings into various applications.</Description>
<Archive sha1sum="244b92a51451ab4c2abc9aebfbe521e6277f7800" type="tarxz">http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.2.tar.xz</Archive>
<Archive sha1sum="af1cad13b431f31a27fb2a1b0599a9c479a732cf" type="tarxz">http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.3.tar.xz</Archive>
<BuildDependencies>
<Dependency>doxygen</Dependency>
<Dependency>zlib-devel</Dependency>
@@ -61,6 +61,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>0.1.3</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.1.2</Version>
multimedia/plugin/ladspa-sdk/pspec.xml
+7
View File
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>1.13</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.13</Version>
multimedia/stream/darkice/actions.py
+2 -3
View File
@@ -9,13 +9,12 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
pisitools.cxxflags.add("-fpermissive")
autotools.configure("--with-alsa \
--with-faac \
--with-vorbis \
--with-lame \
--without-jack \
--disable-static \
--enable-shared")
--without-jack")
def build():
autotools.make()
multimedia/stream/darkice/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>Live audio streamer</Summary>
<Description>DarkIce as a live audio streamer. It records audio from an audio interface (e.g. sound card), encodes it and sends it to a streaming server.</Description>
<Archive sha1sum="508eb0560a7cdf0990a8793f4b8d324ae74bc343" type="targz">https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/darkice/darkice-1.2.tar.gz</Archive>
<Archive sha1sum="541233b78b3399acf2ec89dec5a08c8e54197c53" type="targz">https://sourceforge.net/projects/darkice/files/darkice/1.3/darkice-1.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>lame-devel</Dependency>
@@ -52,6 +52,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>1.3</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>1.2</Version>
multimedia/stream/icecast/pspec.xml
+7
View File
@@ -65,6 +65,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>2.4.3</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2.4.3</Version>
multimedia/stream/libmms/pspec.xml
+7
View File
@@ -37,6 +37,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>0.6.4</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.6.4</Version>
multimedia/stream/live555/pspec.xml
+8 -1
View File
@@ -15,7 +15,7 @@
<!-- we can't use the upstream address as archive since older versions are removed too quickly
web sitesinden adres vermeyin,başka alana çekin, hemen kaynak siliniyor http://www.live555.com/liveMedia/public/-->
<!-- <Archive sha1sum="e67b262d71d46af4b95dcb937aaa0f4385a05dfd" type="targz">http://source.pisilinux.org/1.0/live.2013.10.09.tar.gz</Archive> -->
<Archive sha1sum="28b3e0c4ab90a2cfc56d66fddbb67047d3702617" type="targz">http://distfiles.alpinelinux.org/distfiles/live.2014.05.08.tar.gz</Archive>
<Archive sha1sum="b3ea835186070cca2c47a09d7391d1336698de3f" type="targz">http://distfiles.alpinelinux.org/distfiles/live.2016.10.21.tar.gz</Archive>
<Patches>
<Patch level="1">shared-config.patch</Patch>
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-09</Date>
<Version>2016.10.21</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2014.05.08</Version>
multimedia/stream/rtmpdump/pspec.xml
+7
View File
@@ -51,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>20150115</Version>
<Comment>Rebuild</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>20150115</Version>
multimedia/video/libv4l/pspec.xml
+4 -1
View File
@@ -22,6 +22,8 @@
<Dependency>mesa-glu-devel</Dependency>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>doxygen</Dependency>
<Dependency>eudev-devel</Dependency>
</BuildDependencies>
</Source>
@@ -90,6 +92,7 @@
<Dependency>mesa-glu-32bit</Dependency>
<Dependency>alsa-lib-32bit</Dependency>
<Dependency>qt5-base-32bit</Dependency>
<Dependency>eudev-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>libjpeg-turbo-32bit</Dependency>
@@ -103,7 +106,7 @@
<History>
<Update release="5">
<Date>2017-02-03</Date>
<Date>2017-02-15</Date>
<Version>1.12.2</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
programming/misc/btyacc/pspec.xml
+7
View File
@@ -29,6 +29,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-14</Date>
<Version>3.0</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>3.0</Version>
programming/misc/unixODBC/pspec.xml
+7
View File
@@ -56,6 +56,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>2.3.4</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>2.3.4</Version>
server/database/firebird/pspec.xml
+7
View File
@@ -102,6 +102,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>2.5.4.26856</Version>
<Comment>Release Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-08</Date>
<Version>2.5.4.26856</Version>
x11/library/freeglut/pspec.xml
+7
View File
@@ -78,6 +78,13 @@
</Files>
</Package>
<History>
<Update release="4">
<Date>2017-02-15</Date>
<Version>3.0.0</Version>
<Comment>Rebuild for new Mesa</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-03</Date>
<Version>3.0.0</Version>
x11/library/glew/pspec.xml
+7
View File
@@ -75,6 +75,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-15</Date>
<Version>2.0.0</Version>
<Comment>Rebuild for new Mesa</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-02</Date>
<Version>2.0.0</Version>
x11/library/libdmx/pspec.xml
+7
View File
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>1.1.3</Version>
<Comment>Rebuild for new toolchain.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.3</Version>
x11/library/libepoxy/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>OpenGL function pointer management library</Summary>
<Description>Epoxy is a library for handling OpenGL function pointer management for you.</Description>
<Archive sha1sum="94d98d83a50d2f607ee9986b622a48df00d5926c" type="targz">https://github.com/anholt/libepoxy/archive/v1.3.1.tar.gz</Archive>
<Archive sha1sum="e390e2b1e20938be0cfb171afa51116663e8db26" type="tarxz">https://github.com/anholt/libepoxy/releases/download/v1.4/libepoxy-1.4.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>libX11-devel</Dependency>
<Dependency>mesa-devel</Dependency>
@@ -65,6 +65,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-15</Date>
<Version>1.4</Version>
<Comment>Version bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.3.1</Version>
x11/library/libva/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Video Acceleration (VA) API for Linux</Summary>
<Description>libva is a library providing the VA API video acceleration API.</Description>
<Archive sha1sum="a89680d34236fdc63adeec25cf431c005644b8c6" type="tarbz2">https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.2.tar.bz2</Archive>
<Archive sha1sum="18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8" type="tarbz2">https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.3.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libdrm-devel</Dependency>
<Dependency>libXext-devel</Dependency>
@@ -82,6 +82,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-15</Date>
<Version>1.7.3</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-03</Date>
<Version>1.7.2</Version>
x11/library/mesa-glu/pspec.xml
+7
View File
@@ -66,6 +66,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-15</Date>
<Version>9.0.0</Version>
<Comment>Rebuild for new Mesa</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-03</Date>
<Version>9.0.0</Version>
x11/library/mesa/files/2e6b0e24cfb0f467e8b6d6f394730442a72dcdaf.diff → x11/library/mesa/files/N_01-WIP-nouveau-add-locking.patch
+215 -254
View File
File diff suppressed because it is too large Load Diff
x11/library/mesa/files/2733e5483e1c2b80e4b0ae21187ec5e3e1579397.diff → x11/library/mesa/files/N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch
+24 -6
View File
@@ -1,5 +1,23 @@
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon Jun 6 20:30:48 2016 -0400
Subject: [PATCH 2/5]nouveau: more locking - make sure that fence work is always done with the push mutex acquired
Patch-mainline: N/A
References: boo#997171
Signed-off-by: Max Staudt <mstaudt@suse.de>
Cherry-picked from 2733e5483e1c2b80e4b0ae21187ec5e3e1579397
at https://github.com/imirkin/mesa.git
Signed-off-by: Max Staudt <mstaudt@suse.de>
---
src/gallium/drivers/nouveau/nouveau_buffer.c | 4 ++++
src/gallium/drivers/nouveau/nv50/nv50_miptree.c | 7 +++++--
src/gallium/drivers/nouveau/nv50/nv50_query_hw.c | 5 ++++-
src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c | 5 ++++-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c
index 58fa453..a006e9f 100644
index b54c19b..a5a06cf 100644
--- a/src/gallium/drivers/nouveau/nouveau_buffer.c
+++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
@@ -80,6 +80,8 @@ release_allocation(struct nouveau_mm_allocation **mm,
@@ -12,12 +30,12 @@ index 58fa453..a006e9f 100644
nouveau_fence_work(buf->fence, nouveau_fence_unref_bo, buf->bo);
buf->bo = NULL;
@@ -89,6 +91,8 @@ nouveau_buffer_release_gpu_storage(struct nv04_resource *buf)
if (buf->mm)
release_allocation(&buf->mm, buf->fence);
+ if (buf->fence)
+ pipe_mutex_unlock(buf->fence->screen->push_mutex);
if (buf->domain == NOUVEAU_BO_VRAM)
NOUVEAU_DRV_STAT_RES(buf, buf_obj_current_bytes_vid, -(uint64_t)buf->base.width0);
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_miptree.c b/src/gallium/drivers/nouveau/nv50/nv50_miptree.c
@@ -27,7 +45,7 @@ index 7450119..38e4faf 100644
@@ -163,10 +163,13 @@ nv50_miptree_destroy(struct pipe_screen *pscreen, struct pipe_resource *pt)
{
struct nv50_miptree *mt = nv50_miptree(pt);
- if (mt->base.fence && mt->base.fence->state < NOUVEAU_FENCE_STATE_FLUSHED)
+ if (mt->base.fence && mt->base.fence->state < NOUVEAU_FENCE_STATE_FLUSHED) {
+ pipe_mutex_lock(nouveau_screen(pscreen)->push_mutex);
@@ -37,7 +55,7 @@ index 7450119..38e4faf 100644
+ } else {
nouveau_bo_ref(NULL, &mt->base.bo);
+ }
nouveau_fence_ref(NULL, &mt->base.fence);
nouveau_fence_ref(NULL, &mt->base.fence_wr);
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
@@ -75,4 +93,4 @@ index f2584cb..4b51a67 100644
+ }
}
}
if (size) {
if (size) {
x11/library/mesa/files/940b3a773f264f3f52574160f0d06c48f8e8aeb2.diff → x11/library/mesa/files/N_03-nv30-locking-fixes.patch
+35 -19
View File
@@ -1,11 +1,27 @@
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Tue Jun 21 22:59:50 2016 -0400
Subject: [PATCH 3/5]nv30 locking fixes
Patch-mainline: N/A
References: boo#997171
Signed-off-by: Max Staudt <mstaudt@suse.de>
Cherry-picked from 940b3a773f264f3f52574160f0d06c48f8e8aeb2
at https://github.com/imirkin/mesa.git
Signed-off-by: Max Staudt <mstaudt@suse.de>
---
src/gallium/drivers/nouveau/nv30/nv30_draw.c | 20 ++++++++++++++++++--
src/gallium/drivers/nouveau/nv30/nv30_fragprog.c | 4 ++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
index 10c9f56..c5761a3 100644
index 7b0d074..1c71534 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
@@ -127,6 +127,8 @@ nv30_render_draw_elements(struct vbuf_render *render,
struct nouveau_pushbuf *push = nv30->screen->base.pushbuf;
unsigned i;
+ pipe_mutex_lock(nv30->screen->base.push_mutex);
+
BEGIN_NV04(push, NV30_3D(VTXBUF(0)), r->vertex_info.num_attribs);
@@ -14,13 +30,13 @@ index 10c9f56..c5761a3 100644
@@ -134,8 +136,10 @@ nv30_render_draw_elements(struct vbuf_render *render,
NOUVEAU_BO_LOW | NOUVEAU_BO_RD, 0, NV30_3D_VTXBUF_DMA1);
}
- if (!nv30_state_validate(nv30, ~0, false))
+ if (!nv30_state_validate(nv30, ~0, false)) {
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
return;
+ }
BEGIN_NV04(push, NV30_3D(VERTEX_BEGIN_END), 1);
PUSH_DATA (push, r->prim);
@@ -160,6 +164,8 @@ nv30_render_draw_elements(struct vbuf_render *render,
@@ -30,12 +46,12 @@ index 10c9f56..c5761a3 100644
+
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
}
static void
@@ -172,6 +178,8 @@ nv30_render_draw_arrays(struct vbuf_render *render, unsigned start, uint nr)
unsigned ps = fn + (pn ? 1 : 0);
unsigned i;
+ pipe_mutex_lock(nv30->screen->base.push_mutex);
+
BEGIN_NV04(push, NV30_3D(VTXBUF(0)), r->vertex_info.num_attribs);
@@ -44,13 +60,13 @@ index 10c9f56..c5761a3 100644
@@ -179,8 +187,10 @@ nv30_render_draw_arrays(struct vbuf_render *render, unsigned start, uint nr)
NOUVEAU_BO_LOW | NOUVEAU_BO_RD, 0, NV30_3D_VTXBUF_DMA1);
}
- if (!nv30_state_validate(nv30, ~0, false))
+ if (!nv30_state_validate(nv30, ~0, false)) {
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
return;
+ }
BEGIN_NV04(push, NV30_3D(VERTEX_BEGIN_END), 1);
PUSH_DATA (push, r->prim);
@@ -197,6 +207,8 @@ nv30_render_draw_arrays(struct vbuf_render *render, unsigned start, uint nr)
@@ -60,21 +76,21 @@ index 10c9f56..c5761a3 100644
+
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
}
static void
@@ -386,6 +398,8 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
@@ -383,6 +395,8 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
nv30_render_validate(nv30);
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
+
if (nv30->draw_dirty & NV30_NEW_VIEWPORT)
draw_set_viewport_states(draw, 0, 1, &nv30->viewport);
if (nv30->draw_dirty & NV30_NEW_RASTERIZER)
@@ -451,6 +465,8 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
@@ -448,6 +462,8 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
if (transfer[i])
pipe_buffer_unmap(pipe, transfer[i]);
+ pipe_mutex_lock(nv30->screen->base.push_mutex);
+
nv30->draw_dirty = 0;
@@ -87,18 +103,18 @@ index 6de61bc..fd21f99 100644
@@ -38,6 +38,8 @@ nv30_fragprog_upload(struct nv30_context *nv30)
struct nv30_fragprog *fp = nv30->fragprog.program;
struct pipe_context *pipe = &nv30->base.pipe;
+ pipe_mutex_unlock(nv->screen->push_mutex);
+
if (unlikely(!fp->buffer))
fp->buffer = pipe_buffer_create(pipe->screen, 0, 0, fp->insn_len * 4);
@@ -60,6 +62,8 @@ nv30_fragprog_upload(struct nv30_context *nv30)
if (nv04_resource(fp->buffer)->domain != NOUVEAU_BO_VRAM)
nouveau_buffer_migrate(nv, nv04_resource(fp->buffer), NOUVEAU_BO_VRAM);
+
+ pipe_mutex_lock(nv->screen->push_mutex);
}
void
void
x11/library/mesa/files/N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch
+24
View File
@@ -0,0 +1,24 @@
From: Max Staudt <mstaudt@suse.de>
Date: Wed Oct 5 18:49:41 2016 +0200
Subject: [PATCH 4/5]nv50: Fix double lock in nv50_hw_sm_get_query_result()
Patch-mainline: N/A
References: boo#997171
Signed-off-by: Max Staudt <mstaudt@suse.de>
Signed-off-by: Max Staudt <mstaudt@suse.de>
---
src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
index 31445eb..acc64ac 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
@@ -351,7 +351,7 @@ nv50_hw_sm_get_query_result(struct nv50_context *nv50, struct nv50_hw_query *hq,
pipe_mutex_lock(nv50->screen->base.push_mutex);
ret = nv50_hw_sm_query_read_data(count, nv50, wait, hq, cfg, mp_count);
- pipe_mutex_lock(nv50->screen->base.push_mutex);
+ pipe_mutex_unlock(nv50->screen->base.push_mutex);
if (!ret)
return false;
x11/library/mesa/files/N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch
+29
View File
@@ -0,0 +1,29 @@
From: Max Staudt <mstaudt@suse.de>
Date: Wed Oct 5 18:51:38 2016 +0200
Subject: [PATCH 5/5]Use nv50_render_condition() in nv50_blitctx_post_blit()
Patch-mainline: N/A
References: boo#997171
Signed-off-by: Max Staudt <mstaudt@suse.de>
Analogous to what happens in nvc0_blitctx_post_blit()
Signed-off-by: Max Staudt <mstaudt@suse.de>
---
src/gallium/drivers/nouveau/nv50/nv50_surface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
index d6b9de0..36cd72b 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
@@ -1328,8 +1328,8 @@ nv50_blitctx_post_blit(struct nv50_blitctx *blit)
nv50->samplers[2][1] = blit->saved.sampler[1];
if (nv50->cond_query && !blit->render_condition_enable)
- nv50->base.pipe.render_condition(&nv50->base.pipe, nv50->cond_query,
- nv50->cond_cond, nv50->cond_mode);
+ nv50_render_condition(&nv50->base.pipe, nv50->cond_query,
+ nv50->cond_cond, nv50->cond_mode);
nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_FB);
nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_TEXTURES);
x11/library/mesa/files/n_Define-GLAPIVAR-separate-from-GLAPI.patch
+40
View File
@@ -0,0 +1,40 @@
From: Egbert Eich <eich@suse.de>
Date: Fri Mar 11 13:29:43 2016 +0100
Subject: [PATCH]Define GLAPIVAR separate from GLAPI
Patch-mainline: never
Git-commit: 88dda160564c8c23cb533b0eb258404f1687a2e8
References: bsc#
Signed-off-by: Egbert Eich <eich@suse.com>
GLAPI doesn't contain 'extern' in some environments.
This is needed for variables (GLw).
Signed-off-by: Egbert Eich <eich@suse.de>
---
Mesa-10.0.3/include/GL/gl.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/include/GL/gl.h b/Mesa-10.0.3/include/GL/gl.h
index b484b96..5189008 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -59,6 +59,7 @@
#elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define GLAPI __attribute__((visibility("default")))
# define GLAPIENTRY
+# define GLAPIVAR extern GLAPI
#endif /* WIN32 && !CYGWIN */
/*
@@ -80,6 +81,10 @@
#define GLAPI extern
#endif
+#ifndef GLAPIVAR
+#define GLAPIVAR extern
+#endif
+
#ifndef GLAPIENTRY
#define GLAPIENTRY
#endif
x11/library/mesa/files/n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
+52
View File
@@ -0,0 +1,52 @@
From a9af1af5f1f9aa9fdea9e73135a92f053478f849 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.de>
Date: Wed, 20 Jan 2016 16:10:15 +0100
Subject: [PATCH] VDPAU/XVMC libs: Replace hardlinks with copies
Since these are packaged separately in (open)SUSE anyway, one can use
copies as well. This makes debug packages possible again. (bnc #962609)
Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
---
src/gallium/targets/vdpau/Makefile.am | 4 ++--
src/gallium/targets/xvmc/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index d388f8b..c9cc534 100644
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -86,7 +86,7 @@ all-local: $(vdpau_LTLIBRARIES)
j=libvdpau_gallium.$(LIB_EXT); \
k=libvdpau_$${i}.$(LIB_EXT); \
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
- ln -f .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+ cp -a .libs/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
$${link_dir}/$${l}; \
ln -sf $${l} \
$${link_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
@@ -111,7 +111,7 @@ install-data-hook:
j=libvdpau_gallium.$(LIB_EXT); \
k=libvdpau_$${i}.$(LIB_EXT); \
l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0; \
- ln -f $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+ cp -a $${dest_dir}/$${j}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
$${dest_dir}/$${l}; \
ln -sf $${l} \
$${dest_dir}/$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR); \
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
index fdc5f4b..93ef230 100644
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -73,7 +73,7 @@ install-data-hook:
j=libXvMCgallium.$(LIB_EXT); \
k=libXvMC$${i}.$(LIB_EXT); \
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
+ cp -a $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
$${dest_dir}/$${l}; \
ln -sf $${l} \
$${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \
--
2.6.2
x11/library/mesa/pspec.xml
+8 -4
View File
@@ -40,9 +40,13 @@
<Dependency versionFrom="1.2">libxshmfence-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">2e6b0e24cfb0f467e8b6d6f394730442a72dcdaf.diff</Patch> -->
<Patch level="1">2733e5483e1c2b80e4b0ae21187ec5e3e1579397.diff</Patch>
<Patch level="1">940b3a773f264f3f52574160f0d06c48f8e8aeb2.diff</Patch>
<Patch level="1">n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch</Patch>
<Patch level="1">n_Define-GLAPIVAR-separate-from-GLAPI.patch</Patch>
<Patch level="1">N_01-WIP-nouveau-add-locking.patch</Patch>
<Patch level="1">N_02-nouveau-more-locking-make-sure-that-fence-work-is-always-done-with-the-push-mutex-acquired.patch</Patch>
<Patch level="1">N_03-nv30-locking-fixes.patch</Patch>
<Patch level="1">N_04-nv50-Fix-double-lock-in-nv50_hw_sm_get_query_result.patch</Patch>
<Patch level="1">N_05-Use-nv50_render_condition-in-nv50_blitctx_post_blit.patch</Patch>
</Patches>
</Source>
@@ -177,7 +181,7 @@
<History>
<Update release="5">
<Date>2017-02-12</Date>
<Date>2017-02-15</Date>
<Version>13.0.4</Version>
<Comment>llvm rebuild</Comment>
<Name>Alihan Öztürk</Name>