summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/clutter-gst/PKGBUILD6
-rw-r--r--extra/gmime/PKGBUILD6
-rw-r--r--extra/gnome-keyring/PKGBUILD6
-rw-r--r--extra/gtk-vnc/PKGBUILD6
-rw-r--r--extra/gtk2/PKGBUILD6
-rw-r--r--extra/icedtea-web-java7/PKGBUILD4
-rw-r--r--extra/java7-openjdk/PKGBUILD12
-rw-r--r--extra/java7-openjdk/jdk7-openjdk.profile5
-rw-r--r--extra/java7-openjdk/jre7-openjdk.profile3
-rw-r--r--extra/java7-openjdk/jre7-openjdk.profile.csh3
-rw-r--r--extra/libgsf/PKGBUILD6
-rw-r--r--extra/mediastreamer/PKGBUILD6
-rw-r--r--extra/mediastreamer/mediastreamer-ffmpeg.patch206
-rw-r--r--extra/nautilus-open-terminal/PKGBUILD10
14 files changed, 66 insertions, 219 deletions
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 461cb95ca..5535ed99d 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176007 2013-01-25 17:41:45Z ioni $
+# $Id: PKGBUILD 178920 2013-02-28 18:58:26Z ioni $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
pkgname=clutter-gst
-pkgver=2.0.0
+pkgver=2.0.2
pkgrel=1
pkgdesc="GStreamer bindings for clutter"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('clutter' 'gst-plugins-base-libs' 'libxdamage')
makedepends=('gobject-introspection')
options=('!libtool')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c612926f1e0bbd3c1ad748192cfccf0f15fdff0113db3b983d9f58989431f99a')
+sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 0384bba2c..2de2ee148 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173089 2012-12-10 21:30:33Z jgc $
+# $Id: PKGBUILD 178917 2013-02-28 18:49:48Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Ben <ben@benmazer.net>
pkgname=gmime
-pkgver=2.6.13
+pkgver=2.6.15
pkgrel=1
pkgdesc="Core mime parsing library"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
makedepends=('gtk-sharp-2')
options=('!libtool')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154')
+sha256sums=('b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a')
build() {
# get rid of that .wapi errors in fakeroot
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 3f489f182..2ddf1da9a 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 170820 2012-11-12 08:37:05Z heftig $
+#$Id: PKGBUILD 178926 2013-02-28 19:25:14Z ioni $
# Maintainer: Jan De Groot <jgc@archlinux.org>
pkgname=gnome-keyring
-pkgver=3.6.2
+pkgver=3.6.3
pkgrel=1
pkgdesc="GNOME Password Management daemon"
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
url="http://www.gnome.org"
install=gnome-keyring.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6')
+sha256sums=('e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index 3a02c9737..a403e3373 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168733 2012-10-15 02:01:46Z eric $
+# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <mcrae_allan@hotmail.com>
# Contributor: lp76 <l.peduto@gmail.com>
pkgname=gtk-vnc
-pkgver=0.5.1
+pkgver=0.5.2
pkgrel=1
pkgdesc="A VNC viewer widget for GTK"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('gtk2: GTK2 widget')
makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
options=('!libtool')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40')
+sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f')
build() {
rm -rf gtk2-build gtk3-build
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 86ece58f5..eb887b40e 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177873 2013-02-10 13:29:01Z heftig $
+# $Id: PKGBUILD 178912 2013-02-28 18:37:56Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gtk2
pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.15
+pkgver=2.24.16
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
@@ -13,7 +13,7 @@ options=('!libtool')
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
xid-collision-debug.patch)
-sha256sums=('d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b'
+sha256sums=('93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
build() {
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 756c16915..d304aa9e8 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=icedtea-web-java7
pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
pkgver=1.3.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org/wiki/IcedTea-Web"
license=('GPL2')
@@ -46,6 +46,7 @@ package_icedtea-web-java7() {
pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
provides=('java-web-start=7')
+ replaces=('icedtea-web')
install=${pkgname}.install
cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
@@ -77,6 +78,7 @@ package_icedtea-web-java7() {
package_icedtea-web-java7-doc() {
pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+ replaces=('icedtea-web-doc')
cd "${srcdir}"/icedtea-web*
make DESTDIR="${pkgdir}" install-data-local
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 348991cd9..b395e03a3 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $
+# $Id: PKGBUILD 178897 2013-02-28 13:12:14Z guillaume $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
@@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
@@ -62,10 +62,10 @@ sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940'
'7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
- '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
+ 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
'3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
- 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
- '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9')
+ 'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
+ '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
noextract=("${_OPENJDK_CHANGESET}.tar.gz"
"${_CORBA_CHANGESET}.tar.gz"
@@ -248,7 +248,7 @@ package_jre7-openjdk-headless() {
}
package_jre7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs"
+ pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs"
depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
'alsa-lib: for basic sound support'
diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile
index 91265cc86..89a6a82a0 100644
--- a/extra/java7-openjdk/jdk7-openjdk.profile
+++ b/extra/java7-openjdk/jdk7-openjdk.profile
@@ -1,6 +1 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile
index c86ce857a..b267392e5 100644
--- a/extra/java7-openjdk/jre7-openjdk.profile
+++ b/extra/java7-openjdk/jre7-openjdk.profile
@@ -1,5 +1,4 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
-# enable this for non-reparenting window managers
+# Enable this for non-reparenting window managers
#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh
index a9aed27d1..c4009af2e 100644
--- a/extra/java7-openjdk/jre7-openjdk.profile.csh
+++ b/extra/java7-openjdk/jre7-openjdk.profile.csh
@@ -1,5 +1,4 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
-# enable this for non-reparenting window managers
+# Enable this for non-reparenting window managers
#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index 24f20d70a..cfe96699a 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170960 2012-11-14 03:19:40Z heftig $
+# $Id: PKGBUILD 178924 2013-02-28 19:13:21Z ioni $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
pkgname=libgsf
-pkgver=1.14.25
+pkgver=1.14.26
pkgrel=1
arch=(i686 x86_64)
pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
@@ -13,7 +13,7 @@ options=('!libtool')
depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
makedepends=('intltool' 'gobject-introspection')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2')
+sha256sums=('8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 2e9fb6098..0fb057092 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178134 2013-02-16 22:48:53Z ioni $
+# $Id: PKGBUILD 178928 2013-02-28 19:31:23Z eric $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
pkgname=mediastreamer
pkgver=2.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="A library written in C that allows you to create and run audio and video streams"
arch=('i686' 'x86_64')
url="http://www.linphone.org/"
@@ -18,7 +18,7 @@ source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${
mediastreamer-ffmpeg.patch)
md5sums=('e51ea9d5fce1396b374d10473dfbadec'
'805da7def98f367e621363fa0c951fe8'
- 'f147546489a973f148ce3dd2dba36834')
+ '553d5d47ea4a8c8dfeabdc0281849d5f')
build() {
cd "${srcdir}"/$pkgname-$pkgver
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch
index 944d4b833..3304e9f56 100644
--- a/extra/mediastreamer/mediastreamer-ffmpeg.patch
+++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch
@@ -1,205 +1,57 @@
-diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
-index 5ae8a63..86edf86 100644
---- mediastreamer2/include/mediastreamer2/msvideo.h
-+++ mediastreamer2/include/mediastreamer2/msvideo.h
-@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #define msvideo_h
-
- #include <mediastreamer2/msfilter.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
-
- /* some global constants for video MSFilter(s) */
- #define MS_VIDEO_SIZE_SQCIF_W 128
-@@ -206,7 +212,9 @@ extern "C"{
- MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
- MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
- MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- MS2_PUBLIC void ms_ffmpeg_check_init(void);
-+#endif
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
- MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
+commit f586917ea4d66f9ba8910f0967a8830e54d50784
+Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
+Date: Tue Jun 5 11:07:48 2012 +0200
+
+ Fixes for new versions of ffmpeg
+
diff --git a/src/h264dec.c b/src/h264dec.c
-index 223de3d..8c40a7c 100644
---- mediastreamer2/src/h264dec.c
-+++ mediastreamer2/src/h264dec.c
-@@ -44,7 +44,9 @@ typedef struct _DecData{
+index c4a84ee..5229b5e 100644
+--- a/src/h264dec.c
++++ b/src/h264dec.c
+@@ -45,7 +45,9 @@ typedef struct _DecData{
static void ffmpeg_init(){
static bool_t done=FALSE;
if (!done){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
++#ifdef FF_API_AVCODEC_INIT
avcodec_init();
+#endif
avcodec_register_all();
done=TRUE;
}
-diff --git a/src/mscommon.c b/src/mscommon.c
-index 2cab005..bebb946 100644
---- mediastreamer2/src/mscommon.c
-+++ mediastreamer2/src/mscommon.c
-@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #include "mediastreamer2/mscodecutils.h"
- #include "mediastreamer2/msfilter.h"
- #include <ortp/ortp_srtp.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
-
- extern void __register_ffmpeg_encoders_if_possible(void);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- extern bool_t libmsandroiddisplay_init(void);
- extern void libmsandroiddisplaybad_init(void);
- extern void libmsandroidopengldisplay_init(void);
-@@ -645,7 +653,9 @@ void ms_init(){
- }
- }
- #if !defined(NO_FFMPEG)
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- ms_ffmpeg_check_init();
-+#endif
- __register_ffmpeg_encoders_if_possible();
- #endif
- #endif
-diff --git a/src/videodec.c b/src/videodec.c
-index c04e1e9..a455075 100644
---- mediastreamer2/src/videodec.c
-+++ mediastreamer2/src/videodec.c
-@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #include "mediastreamer2/msvideo.h"
- #include "mediastreamer2/msticker.h"
- #include "rfc2429.h"
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
-
--
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
-
-
- typedef struct DecState{
-@@ -50,7 +57,9 @@ typedef struct DecState{
-
- static void dec_init(MSFilter *f, enum CodecID cid){
- DecState *s=(DecState *)ms_new0(DecState,1);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- ms_ffmpeg_check_init();
-+#endif
-
- avcodec_get_context_defaults(&s->av_context);
- s->av_codec=NULL;
diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..520f06a 100644
---- mediastreamer2/src/videoenc.c
-+++ mediastreamer2/src/videoenc.c
-@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
+index 21d016f..fb35760 100644
+--- a/src/videoenc.c
++++ b/src/videoenc.c
+@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
static bool_t avcodec_initialized=FALSE;
-+#endif
++#ifndef FF_I_TYPE
++#define FF_I_TYPE AV_PICTURE_TYPE_I
++#endif
++
#ifdef ENABLE_LOG_FFMPEG
-@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-
- #endif
+ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
void ms_ffmpeg_check_init(){
if(!avcodec_initialized){
++#ifdef FF_API_AVCODEC_INIT
avcodec_init();
-@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
- #endif
- }
- }
+#endif
-
- /* the goal of this small object is to tell when to send I frames at startup:
- at 2 and 4 seconds*/
-@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
- {
- EncState *s=(EncState *)ms_new(EncState,1);
- f->data=s;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- ms_ffmpeg_check_init();
-+#endif
- s->profile=0;/*always default to profile 0*/
- s->comp_buf=NULL;
- s->fps=15;
-@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
+ avcodec_register_all();
+ avcodec_initialized=TRUE;
+ #ifdef ENABLE_LOG_FFMPEG
+@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
if (s->profile==0){
s->codec=CODEC_ID_H263;
}else{
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
++ /*
c->flags|=CODEC_FLAG_H263P_UMV;
-+#endif
c->flags|=CODEC_FLAG_AC_PRED;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+#endif
- /*
+- /*
c->flags|=CODEC_FLAG_OBMC;
c->flags|=CODEC_FLAG_AC_PRED;
-@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
- // assume video size is CIF or QCIF
- if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- else header->b_wptr[1] = 0x40;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+#else
-+ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
-+#endif
- header->b_wptr += 4;
- header->b_cont = *packet;
- *packet = header;
-@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- s->req_vfu=TRUE;
- }
- if (s->req_vfu){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- pict.pict_type=FF_I_TYPE;
-+#else
-+ pict.pict_type=AV_PICTURE_TYPE_I;
-+#endif
- s->req_vfu=FALSE;
- }
- comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- if (s->framenum==1){
- video_starter_first_frame (&s->starter,f->ticker->time);
- }
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- if (c->coded_frame->pict_type==FF_I_TYPE){
-+#else
-+ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
-+#endif
- ms_message("Emitting I-frame");
- }
- comp_buf->b_wptr+=error;
-@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
- #endif
-
- void __register_ffmpeg_encoders_if_possible(void){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- ms_ffmpeg_check_init();
-+#endif
- if (avcodec_find_encoder(CODEC_ID_MPEG4))
- ms_filter_register(&ms_mpeg4_enc_desc);
- if (avcodec_find_encoder(CODEC_ID_H263)){
+ */
diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD
index f99837098..fcd1cb9a6 100644
--- a/extra/nautilus-open-terminal/PKGBUILD
+++ b/extra/nautilus-open-terminal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169998 2012-10-30 23:01:23Z heftig $
+# $Id: PKGBUILD 178922 2013-02-28 19:09:50Z ioni $
# Maintainer : Biru Ionut <ionut@archlinux.ro>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=nautilus-open-terminal
-pkgver=0.19
-pkgrel=3
+pkgver=0.20
+pkgrel=1
pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
arch=('i686' 'x86_64')
url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
@@ -12,9 +12,9 @@ license=('GPL')
depends=('nautilus' 'gconf')
makedepends=('pkgconfig' 'gettext' 'intltool')
install=nautilus-open-terminal.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
options=('!libtool' '!emptydirs')
-sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
+sha256sums=('84905e98a13990ef73ce698144bdf0ad9adb1346c22a7d7381a3d65f17a364f0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-25 18:57:04 +0000