diff --git a/multimedia/graphics/gimp/addon/gimp-data-extras/pspec.xml b/multimedia/graphics/gimp/addon/gimp-data-extras/pspec.xml index c473aa451a..9229a7d9b7 100644 --- a/multimedia/graphics/gimp/addon/gimp-data-extras/pspec.xml +++ b/multimedia/graphics/gimp/addon/gimp-data-extras/pspec.xml @@ -13,7 +13,7 @@ data Gimp extras Contains extra brushes, palettes, and gradients for extra GIMPy artistic enjoyment. - ftp://ftp.gimp.org/pub/gimp/extras/gimp-data-extras-2.0.2.tar.bz2 + http://download.gimp.org/pub/gimp/extras/gimp-data-extras-2.0.2.tar.bz2 gimp-devel diff --git a/multimedia/graphics/gimp/addon/gimp-dds-plugin/pspec.xml b/multimedia/graphics/gimp/addon/gimp-dds-plugin/pspec.xml index 94856474aa..4a4c18f29c 100644 --- a/multimedia/graphics/gimp/addon/gimp-dds-plugin/pspec.xml +++ b/multimedia/graphics/gimp/addon/gimp-dds-plugin/pspec.xml @@ -23,19 +23,21 @@ atk cairo + glib2 fontconfig gdk-pixbuf gimp gtk2 pango libgomp + freetype /usr/lib/gimp/2.0/plug-ins/dds /usr/share/doc/gimp-dds-plugin - + 2014-06-19 diff --git a/multimedia/graphics/gimp/addon/gimp-focusblur-plugin/pspec.xml b/multimedia/graphics/gimp/addon/gimp-focusblur-plugin/pspec.xml index d0da8f4a54..33f5d8ec9a 100644 --- a/multimedia/graphics/gimp/addon/gimp-focusblur-plugin/pspec.xml +++ b/multimedia/graphics/gimp/addon/gimp-focusblur-plugin/pspec.xml @@ -15,10 +15,11 @@ fftw3-devel gimp-devel + intltool http://registry.gimp.org/files/focusblur-3.2.6.tar.bz2 - + gimp-focusblur-plugin @@ -26,6 +27,7 @@ gdk-pixbuf gimp gtk2 + glib2 /usr/lib/gimp/2.0/plug-ins @@ -33,7 +35,7 @@ /usr/share/locale - + 2014-06-19 diff --git a/multimedia/video/xine-lib/actions.py b/multimedia/video/xine-lib/actions.py new file mode 100644 index 0000000000..578ac17527 --- /dev/null +++ b/multimedia/video/xine-lib/actions.py @@ -0,0 +1,80 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import libtools +from pisi.actionsapi import get + +def setup(): + shelltools.export("CFLAGS", "%s -fno-strict-aliasing -fno-force-addr -ffunction-sections -frename-registers -fomit-frame-pointer" % get.CFLAGS()) + shelltools.export("CXXFLAGS", "%s -fno-strict-aliasing -fno-force-addr -ffunction-sections -frename-registers -fomit-frame-pointer" % get.CXXFLAGS()) + shelltools.export("CCASFLAGS","-Wa,--noexecstack") + # to get rid of cvs + shelltools.export("AUTOPOINT", "true") + + #libtools.libtoolize("--force --copy") + autotools.autoreconf("-vfi") + autotools.configure(" \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-altivec \ + --disable-artstest \ + --disable-dxr3 \ + --disable-vidix \ + --disable-vcd \ + --disable-mpcdec \ + --enable-aalib \ + --enable-asf \ + --enable-directfb \ + --enable-faad \ + --enable-fb \ + --enable-ffmpeg-popular-codecs \ + --enable-ffmpeg-uncommon-codecs \ + --enable-ipv6 \ + --enable-mmap \ + --enable-modplug \ + --enable-opengl \ + --disable-samba \ + --enable-xinerama \ + --with-external-a52dec \ + --with-external-ffmpeg \ + --with-external-libmad \ + --with-vorbis \ + --with-x \ + --with-xcb \ + --with-xv-path=/usr/lib \ + --with-freetype \ + --with-fontconfig \ + --without-esound \ + --without-imagemagick \ + --without-jack \ + --disable-gdkpixbuf \ + --disable-nls \ + --disable-rpath \ + --disable-syncfb \ + --disable-optimizations \ + --disable-dependency-tracking") + # the world is not ready for this code, see bug #8267 + # --enable-antialiasing \ + #--enable-mng \ + #--with-wavpack \ + #--with-internal-vcdlibs \ + + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.removeDir("/usr/share/doc/xine-lib") + + pisitools.dohtml("doc/faq/faq.html", "doc/hackersguide/*.html", "doc/hackersguide/*.png") + pisitools.dodoc("AUTHORS", "ChangeLog", "README", "TODO", "doc/README*", "doc/faq/faq.txt") + diff --git a/multimedia/video/xine-lib/files/accel_vaapi.h b/multimedia/video/xine-lib/files/accel_vaapi.h new file mode 100644 index 0000000000..666b23fd60 --- /dev/null +++ b/multimedia/video/xine-lib/files/accel_vaapi.h @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2008 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * + * + * Common acceleration definitions for vdpau + * + * + */ + +#ifndef HAVE_XINE_ACCEL_VAAPI_H +#define HAVE_XINE_ACCEL_VAAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#ifdef HAVE_FFMPEG_AVUTIL_H +# include +#else +# include +#endif + +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) +# define AVVIDEO 2 +#else +# define AVVIDEO 1 +# define pp_context pp_context_t +# define pp_mode pp_mode_t +#endif + +#define NUM_OUTPUT_SURFACES 22 + +#define SURFACE_FREE 0 +#define SURFACE_ALOC 1 +#define SURFACE_RELEASE 2 +#define SURFACE_RENDER 3 +#define SURFACE_RENDER_RELEASE 5 + +struct vaapi_equalizer { + VADisplayAttribute brightness; + VADisplayAttribute contrast; + VADisplayAttribute hue; + VADisplayAttribute saturation; +}; + +typedef struct ff_vaapi_context_s ff_vaapi_context_t; + +struct ff_vaapi_context_s { + VADisplay va_display; + VAContextID va_context_id; + VAConfigID va_config_id; + int width; + int height; + int sw_width; + int sw_height; + int va_profile; + unsigned int va_colorspace; + VAImage va_subpic_image; + VASubpictureID va_subpic_id; + int va_subpic_width; + int va_subpic_height; + int is_bound; + void *gl_surface; + unsigned int soft_head; + unsigned int valid_context; + unsigned int va_head; + unsigned int va_soft_head; + vo_driver_t *driver; + unsigned int last_sub_image_fmt; + VASurfaceID last_sub_surface_id; + struct vaapi_equalizer va_equalizer; + VAImageFormat *va_image_formats; + int va_num_image_formats; + VAImageFormat *va_subpic_formats; + int va_num_subpic_formats; +}; + +typedef struct ff_vaapi_surface_s ff_vaapi_surface_t; +typedef struct vaapi_accel_s vaapi_accel_t; + +struct ff_vaapi_surface_s { + unsigned int index; + vaapi_accel_t *accel; + VASurfaceID va_surface_id; + unsigned int status; +}; + +struct vaapi_accel_s { + unsigned int index; + vo_frame_t *vo_frame; + +#if AVVIDEO > 1 + int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, AVPacket *avpkt); +#else + int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, uint8_t *buf, int buf_size); +#endif + VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender); + int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec); + ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen); + int (*guarded_render)(vo_frame_t *frame_gen); + ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen); + void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); + void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); +}; + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/multimedia/video/xine-lib/files/deepbind.patch b/multimedia/video/xine-lib/files/deepbind.patch new file mode 100644 index 0000000000..b04400ba48 --- /dev/null +++ b/multimedia/video/xine-lib/files/deepbind.patch @@ -0,0 +1,20 @@ +--- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~ 2005-09-19 09:14:02.000000000 -0700 ++++ xine-lib-1.1.1/src/xine-engine/load_plugins.c 2006-04-22 23:07:33.000000000 -0700 +@@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this + printf("load_plugins: %s not cached\n", str); + #endif + +- if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { ++ if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { + const char *error = dlerror(); + /* too noisy -- but good to catch unresolved references */ + xprintf(this, XINE_VERBOSITY_LOG, +@@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th + /* load the dynamic library if needed */ + if (!node->file->lib_handle) { + lprintf("dlopen %s\n", filename); +- if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { ++ if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { + const char *error = dlerror(); + + xine_log (this, XINE_LOG_PLUGIN, diff --git a/multimedia/video/xine-lib/files/dmo.patch b/multimedia/video/xine-lib/files/dmo.patch new file mode 100644 index 0000000000..d16c252ac6 --- /dev/null +++ b/multimedia/video/xine-lib/files/dmo.patch @@ -0,0 +1,44 @@ +diff -Nur xine-lib-1.1.15-old/src/libw32dll/dmo/DMO_VideoDecoder.c xine-lib-1.1.15/src/libw32dll/dmo/DMO_VideoDecoder.c +--- xine-lib-1.1.15-old/src/libw32dll/dmo/DMO_VideoDecoder.c 2008-09-27 20:55:34.000000000 +0300 ++++ xine-lib-1.1.15/src/libw32dll/dmo/DMO_VideoDecoder.c 2008-09-27 21:33:01.000000000 +0300 +@@ -87,7 +87,7 @@ + { 24, 24, &MEDIASUBTYPE_RGB24, CAP_NONE }, + { 32, 32, &MEDIASUBTYPE_RGB32, CAP_NONE }, + +- {0}, ++ {0,0,NULL,0}, + }; + + DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto) +@@ -288,8 +288,8 @@ + props.cBuffers = 1; + props.cbBuffer = this->m_sDestType.lSampleSize; + +- //don't know how to do this correctly +- props.cbAlign = props.cbPrefix = 0; ++ props.cbAlign = 1; ++ props.cbPrefix = 0; + this->m_pDMO_Filter->m_pAll->vt->SetProperties(this->m_pDMO_Filter->m_pAll, &props, &props1); + this->m_pDMO_Filter->m_pAll->vt->Commit(this->m_pDMO_Filter->m_pAll); + #endif +@@ -327,7 +327,7 @@ + bufferin = CMediaBufferCreate(size, (void*)src, size, 0); + result = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0, + (IMediaBuffer*)bufferin, +- (is_keyframe) ? DMO_INPUT_DATA_BUFFERF_SYNCPOINT : 0, ++ DMO_INPUT_DATA_BUFFERF_SYNCPOINT, + 0, 0); + ((IMediaBuffer*)bufferin)->vt->Release((IUnknown*)bufferin); + +@@ -463,8 +463,9 @@ + this->iv.m_obh.biSize = sizeof(BITMAPINFOHEADER); + this->iv.m_obh.biCompression=csp; + this->iv.m_obh.biBitCount=bits; +- this->iv.m_obh.biSizeImage=labs(this->iv.m_obh.biBitCount* +- this->iv.m_obh.biWidth*this->iv.m_obh.biHeight)>>3; ++ ++ this->iv.m_obh.biSizeImage = labs(this->iv.m_obh.biWidth * this->iv.m_obh.biHeight) ++ * ((this->iv.m_obh.biBitCount + 7) / 8); + } + } + this->m_sDestType.lSampleSize = this->iv.m_obh.biSizeImage; diff --git a/multimedia/video/xine-lib/files/list.patch b/multimedia/video/xine-lib/files/list.patch new file mode 100644 index 0000000000..5df2e0a334 --- /dev/null +++ b/multimedia/video/xine-lib/files/list.patch @@ -0,0 +1,16 @@ +diff -urN xine-lib-1.1.12.orig/misc/xine-list.c xine-lib-1.1.12/misc/xine-list.c +--- xine-lib-1.1.12.orig/misc/xine-list.c 2008-04-06 21:32:21 +0300 ++++ xine-lib-1.1.12/misc/xine-list.c 2008-04-19 21:15:50 +0300 +@@ -125,7 +125,11 @@ + sep = strchr (text, ';') ? : text + strlen (text); + sep2 = which == 'a' ? sep : strchr (text, ':') ? : sep; + if (!*sep) +- break; ++ { ++ if (text[0]) ++ printf ("%s;", text); ++ break; ++ } + if (printf ("%.*s;", (int)(sep2 - text), text) < 0 || (lf && puts ("") < 0)) + goto write_fail; + } diff --git a/multimedia/video/xine-lib/files/lpthread.patch b/multimedia/video/xine-lib/files/lpthread.patch new file mode 100644 index 0000000000..3af70675e5 --- /dev/null +++ b/multimedia/video/xine-lib/files/lpthread.patch @@ -0,0 +1,30 @@ +diff -Nur xine-lib-1.1.19-old//m4/pthreads.m4 xine-lib-1.1.19/m4/pthreads.m4 +--- xine-lib-1.1.19-old//m4/pthreads.m4 2010-09-04 18:26:52.719999251 +0300 ++++ xine-lib-1.1.19/m4/pthreads.m4 2010-09-04 18:28:15.110999847 +0300 +@@ -15,7 +15,7 @@ + AC_ARG_VAR([PTHREAD_CFLAGS], [C compiler flags for Pthread support]) + AC_ARG_VAR([PTHREAD_LIBS], [linker flags for Pthread support]) + +- dnl if PTHREAD_* are not set, default to -pthread (GCC) ++ dnl if PTHREAD_* are not set, default to -lpthread (GCC) + if test "${PTHREAD_CFLAGS-unset}" = "unset"; then + case $host in + *-mingw*) PTHREAD_CFLAGS="" ;; +@@ -25,7 +25,7 @@ + dnl Handle Sun Studio compiler (also on Linux) + CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt"]);; + +- *) PTHREAD_CFLAGS="-pthread" ;; ++ *) PTHREAD_CFLAGS="-lpthread" ;; + esac + fi + if test "${PTHREAD_LIBS-unset}" = "unset"; then +@@ -36,7 +36,7 @@ + *-solaris*) + dnl Use the same libraries for gcc and Sun Studio cc + PTHREAD_LIBS="-lpthread -lposix4 -lrt";; +- *) PTHREAD_LIBS="-pthread" ;; ++ *) PTHREAD_LIBS="-lpthread" ;; + esac + + dnl Again, handle Sun Studio compiler diff --git a/multimedia/video/xine-lib/files/multilib.patch b/multimedia/video/xine-lib/files/multilib.patch new file mode 100644 index 0000000000..4609e63725 --- /dev/null +++ b/multimedia/video/xine-lib/files/multilib.patch @@ -0,0 +1,16 @@ +diff -up xine-lib-1.1.16.2/misc/xine-config.in.multilib xine-lib-1.1.16.2/misc/xine-config.in +--- xine-lib-1.1.16.2/misc/xine-config.in.multilib 2008-06-25 08:04:09.000000000 -0500 ++++ xine-lib-1.1.16.2/misc/xine-config.in 2009-02-20 07:34:27.000000000 -0600 +@@ -6,12 +6,6 @@ unset prefix + unset exec_prefix + unset args + +-PKG_CONFIG_PATH="`cat <<'EOF' +-@XINE_PKGCONFIG_DIR@ +-EOF +-`${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" +-export PKG_CONFIG_PATH +- + usage() + { + cat < + + + + xine-lib + http://xine.sourceforge.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + Core libraries for Xine movie player + This package contains the Xine library. It can be used to play back various media, decode multimedia files from local disk drives, and display multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some uncommon formats, too. + http://sourceforge.net/projects/xine/files/xine-lib/1.2.6/xine-lib-1.2.6.tar.xz + + accel_vaapi.h + + + libXext-devel + + fontconfig-devel + freetype-devel + zlib-devel + libXinerama-devel + libXv-devel + libXvMC-devel + libogg-devel + libvorbis-devel + mesa-devel + libdvdcss-devel + DirectFB-devel + flac-devel + libsdl-devel + alsa-lib-devel + aalib-devel + libtheora-devel + libvpx-devel + samba-devel + libmad-devel + speex-devel + libmodplug-devel + ffmpeg-devel + a52dec-devel + + libv4l-devel + pulseaudio-libs-devel + + libdca-devel + libbluray-devel + libmng-devel + + libSM-devel + libICE-devel + libcdio-devel + mesa-glu-devel + libvdpau-devel + + + list.patch + multilib.patch + no_autopoint.patch + dmo.patch + tr_segfault_fix.patch + deepbind.patch + lpthread.patch + + + + + xine-lib + + mesa + zlib + flac + + speex + aalib + libXv + + libmad + a52dec + + libdca + libsdl + libogg + libv4l + ffmpeg + libX11 + + libXvMC + + libXext + libvpx + libxcb + alsa-lib + freetype + DirectFB + libvdpau + mesa-glu + + + + libtheora + libbluray + libvorbis + fontconfig + libmodplug + + pulseaudio-libs + + + + /usr/bin + /usr/lib + /usr/share/xine + /usr/share/xine-lib/fonts + /usr/share/man + /usr/share/doc/xine-lib + + + + + xine-lib-devel + Development files for xine-lib + + xine-lib + + + /usr/bin/xine-config + /usr/lib/pkgconfig + /usr/include + /usr/share/aclocal + + + + + + 2014-07-07 + 1.2.6 + Rebuild for ffmpeg + Kamil Atlı + suvari@pisilinux.org + + + 2014-07-07 + 1.2.6 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-20 + 1.2.5 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-12-20 + 1.2.3 + Fix unneeded dependencies, remove DirectBD-devel from runtime deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-11-30 + 1.2.3 + Rebuild for ffmpeg. + PisiLinux Community + admins@pisilinux.org + + + 2013-10-14 + 1.2.3 + rebuild for DirectFB. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-07-07 + 1.2.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-30 + 1.2.2 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/multimedia/video/xine-lib/translations.xml b/multimedia/video/xine-lib/translations.xml new file mode 100644 index 0000000000..6dc475ac4c --- /dev/null +++ b/multimedia/video/xine-lib/translations.xml @@ -0,0 +1,15 @@ + + + + xine-lib + Xine çokluortam oynatıcısının çekirdek kitaplıkları + Librairies centrales pour le lecteur vidéo Xine. + xine-lib çeşitli medyaları oynatmak, farklı medya yapılarını birbirine dönüştürmek, Internet üzerinden yayınları işleyip göstermek gibi işlevleri olan bir çokluortam kitaplığıdır. Yaygın çokluortam yapılarının çoğunu desteklediği gibi fazla yaygın olmayan yapıları da desteklemektedir. + + + + xine-lib-devel + xine-lib için geliştirme dosyaları + xine-lib için geliştirme dosyaları + + diff --git a/science/robotics/opencv/pspec.xml b/science/robotics/opencv/pspec.xml index 14e06cfa5a..f107865e58 100644 --- a/science/robotics/opencv/pspec.xml +++ b/science/robotics/opencv/pspec.xml @@ -12,11 +12,10 @@ library Computer vision library opencv is a programming library mainly aimed at the real time computer vision. Example applications are human-computer interaction, object identification, face recognition, motion tracking, mobile robotics. - https://github.com/Itseez/opencv/archive/2.4.9.tar.gz + https://github.com/Itseez/opencv/archive/2.4.11.tar.gz - eigen + cmake gtk2-devel - tiff-devel libv4l-devel openexr-libs jasper-devel @@ -25,10 +24,8 @@ openexr-devel lapack-devel xine-lib-devel - xine-lib-devel libdc1394-devel gstreamer-devel - intel-tbb-devel libjpeg-turbo-devel gst-plugins-base-devel @@ -38,14 +35,16 @@ opencv gtk2 - tiff + zlib + glib2 jasper + libgcc + libpng libv4l ilmbase - openexr + openexr-libs xine-lib libdc1394 - intel-tbb gstreamer openexr-libs gst-plugins-base @@ -81,6 +80,13 @@ + + 2015-08-10 + 2.4.11 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2014-05-15 2.4.9