rebuild vlc

2025-02-03 04:47:13 +08:00 · 2016-01-16 01:24:29 +00:00 · 2016-01-16 01:24:29 +00:00 · 212a54456e
commit 212a54456e
parent 2ef0e9645e
9 changed files with 398 additions and 61 deletions
--- a/libgoom2/PKGBUILD
+++ b/libgoom2/PKGBUILD
@ -0,0 +1,28 @@
+# Arch contributor: https://projects.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/libgoom2
+
+pkgname=libgoom2
+pkgver=2k4
+pkgrel=1
+pkgdesc="Shared library part of the Goom visualization plugin"
+arch=('i686' 'x86_64')
+url="http://www.fovea.cc/?page=details_produits&id=goom"
+license=('LGPL')
+depends=('glibc')
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/project/goom/goom2k4/0/goom-2k4-0-src.tar.gz")
+md5sums=('8100dd07e0c6784fdf079eeaa53a5c7f')
+
+build() {
+  cd "${srcdir}/goom2k4-0"
+
+  ./configure --prefix=/usr \
+              --without-xmms \
+              --without-sdl
+  make
+}
+
+package() {
+  cd "${srcdir}/goom2k4-0"
+
+  make DESTDIR="${pkgdir}" install
+}
--- a/libtar/PKGBUILD
+++ b/libtar/PKGBUILD
@ -0,0 +1,39 @@
+# Arch contributor: https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/libtar
+
+pkgname=libtar
+pkgver=1.2.20
+pkgrel=1
+pkgdesc="C library for manipulating POSIX tar files"
+arch=('i686' 'x86_64')
+url="http://repo.or.cz/w/libtar.git/"
+license=('BSD')
+depends=('zlib')
+source=("http://pkgbuild.com/~giovanni/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('c8507795b3d461ed10566a61fb4cad9b')
+
+prepare() {
+  cd "${srcdir}/${pkgname}"
+
+  sed -i \
+      -e '/INSTALL_PROGRAM/s:-s::' {doc,lib{,tar}}/Makefile.in
+}
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  export CFLAGS+=" -fPIC"
+
+  autoreconf -fi
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man \
+              --disable-static \
+              --disable-encap \
+              --disable-epkg-install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
--- a/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
+++ b/mplayer/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
@ -0,0 +1,41 @@
+From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Mon, 19 Oct 2015 22:44:11 -0700
+Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
+
+VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
+from libvpx and the remaining values were never used here
+
+Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
+Signed-off-by: James Zern <jzern@google.com>
+---
+ libavcodec/libvpxenc.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
+index 5f39783..992122c 100644
+--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
+@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
+ 
+ /** String mappings for enum vp8e_enc_control_id */
+ static const char *const ctlidstr[] = {
+-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
+-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
+-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
+-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
+-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
+-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
+     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
+     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
+     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
+-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
+     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
+     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
+-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
+     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
+     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
+     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
+-- 
+1.7.10.4
+
--- a/projectm/PKGBUILD
+++ b/projectm/PKGBUILD
@ -2,31 +2,91 @@
 # Maintainer:
 # Contributor: Alexander Baldeck <alexander@archlinux.org>

-pkgname=projectm
-pkgver=2.0.1
-pkgrel=2
-pkgdesc="A music visualizer which uses 3D accelerated iterative image based rendering"
-arch=('i686' 'x86_64')
-url="http://projectm.sourceforge.net/"
+pkgbase=projectm
+pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-jack' 'projectm-qt' 'projectm-test')
+pkgver=2.1.0
+pkgrel=1
+arch=('x86_64' 'i686')
+url='http://projectm.sourceforge.net/'
 license=('LGPL')
-depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext')
-makedepends=('pkgconfig' 'cmake')
-source=(http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz)
-md5sums=('f8bf795878cdbbef54784cf2390b4c89')
+makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
+source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz"
+        'projectm-test-opengl.patch'
+        'projectm-install-vera-ttf.patch')
+sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee'
+            'c577d8356be011a3b3ee9f9b389db55f47804d100f690d8ea12f2920cdd432d1'
+            '7d67aad0b210edf25a527274504c9efdf3e9d5b737235b938fec361ac5a8b110')
+
+prepare() {
+  cd "projectM-complete-$pkgver-Source"
+
+  patch -p1 -i "$srcdir/projectm-test-opengl.patch"
+  patch -p1 -i "$srcdir/projectm-install-vera-ttf.patch"
+  mkdir -p "$srcdir/build"
+}

 build() {
-  cd ${srcdir}
-#  sed -i 's|FTGL/FTGL.h|FTGL/ftgl.h|' Renderer.hpp || return 1
-#  sed -i "s|#include <iostream>|#include <cstdio>\n#include <iostream>|" BuiltinParams.cpp || return 1
-  mkdir build
  cd build
-  cmake ../projectM-${pkgver}-Source \
+
+  cmake \
+    -Wno-dev \
    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release || return 1
-  make || return 1
+    -DCMAKE_BUILD_TYPE=Release \
+    -DINCLUDE-PROJECTM-JACK=ON \
+    "../projectM-complete-$pkgver-Source"
+  make
 }

-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install || return 1
+package_projectm() {
+  pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
+  depends=('ftgl' 'glew' 'libgl')
+
+  cd "$srcdir/build"
+  for dirs in src/{NativePresets,libprojectM}; do
+    make -C "$dirs" DESTDIR="$pkgdir" install
+  done
 }
+
+package_projectm-libvisual() {
+  pkgdesc='ProjectM plugin for XMMS'
+  depends=('projectm' 'libvisual' 'gcc-libs')
+  replaces=('libvisual-projectm')
+  provides=('libvisual-projectm')
+  
+  cd "$srcdir/build/src/projectM-libvisual"
+  make DESTDIR="$pkgdir" install
+}
+
+package_projectm-pulseaudio() {
+  pkgdesc='ProjectM support for Pulseaudio'
+  depends=('projectm-qt' 'pulseaudio')
+  
+  cd "$srcdir/build/src/projectM-pulseaudio"
+  make DESTDIR="$pkgdir" install
+}
+
+package_projectm-jack() {
+  pkgdesc='ProjectM support for Jack'
+  depends=('projectm-qt' 'jack')
+  
+  cd "$srcdir/build/src/projectM-jack"
+  make DESTDIR="$pkgdir" install
+}
+
+package_projectm-qt() {
+  pkgdesc='Qt bindings for ProjectM'
+  depends=('projectm' 'qt4' 'libgl')
+  
+  cd "$srcdir/build/src/projectM-qt"
+  make DESTDIR="$pkgdir" install
+}
+
+package_projectm-test() {
+  pkgdesc='ProjectM test applications'
+  depends=('projectm' 'sdl' 'libgl')
+  
+  cd "$srcdir/build/src/projectM-test"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
--- a/projectm/projectm-install-vera-ttf.patch
+++ b/projectm/projectm-install-vera-ttf.patch
@ -0,0 +1,12 @@
+diff -rupN projectM-complete-2.1.0-Source.old/src/libprojectM/CMakeLists.txt projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+--- projectM-complete-2.1.0-Source.old/src/libprojectM/CMakeLists.txt	2012-06-30 02:21:45.134586637 -0300
+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt	2012-06-30 02:24:58.476872545 -0300
+@@ -224,7 +224,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY)
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+-	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/Vera.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts)
+ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf")
+ 
+ IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf")
--- a/projectm/projectm-test-opengl.patch
+++ b/projectm/projectm-test-opengl.patch
@ -0,0 +1,19 @@
+diff -rupN projectM-complete-2.1.0-Source.old/src/projectM-test/CMakeLists.txt projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt
+--- projectM-complete-2.1.0-Source.old/src/projectM-test/CMakeLists.txt	2012-05-20 00:43:26.000000000 -0300
+++ projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt	2012-06-30 01:01:55.947058502 -0300
+@@ -35,11 +35,11 @@ elseif (${CMAKE_PROJECT_NAME} MATCHES ${
+    set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})
+ endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
+ 
+-INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ LINK_DIRECTORIES(${PROJECTM_LINK})
+ 
+-TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY})
+-TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} )
+-TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} )
+TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
+TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
+TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} ${OPENGL_gl_LIBRARY} )
+ 
+ INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
--- a/vlc/PKGBUILD
+++ b/vlc/PKGBUILD
@ -2,44 +2,52 @@

 pkgname=vlc
 pkgver=2.2.1
-pkgrel=9
+pkgrel=10
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('x86_64')
 url="http://www.videolan.org/vlc/"
-pkgdesc=('A multimedia player and framework that plays most multimedia files as well as DVD, Audio CD, VCD, and various streaming protocols')
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'lua' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libgme' 'libupnp' 
-         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394' 'lirc' 'libcaca' 
-             'librsvg' 'portaudio' 'libgme' 'aalib' 'libmtp'
-             'vcdimager' 'opus' 'libssh2' 'samba'
-             'chromaprint' 'unzip')
-optdepends=('aalib: for ASCII art plugin'
-            'avahi: for service discovery using bonjour protocol'
-            'flac: for Free Lossless Audio Codec plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libbluray: for Blu-Ray support'
-            'libcaca: for colored ASCII art video output'
-            'libcdio: for audio CD playback support'
-            'libdc1394: for IEEE 1394 plugin'
-            'libdvdcss: for decoding encrypted DVDs'
-            'libmtp: for MTP devices support'
+license=('LGPL2.1' 'GPL2')
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
+         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+         'libxinerama')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac'
+             'libdc1394' 'libavc1394' 'lirc' 'libcaca'
+             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
+             'twolame' 'aalib' 'libmtp' 'libdvdcss'
+             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
+optdepends=('avahi: for service discovery using bonjour protocol'
            'libnotify: for notification plugin'
-            'librsvg: for SVG plugin'
-            'libssh2: for sftp support'
-            'libva-intel-driver: back-end for intel cards'
-            'libva-vdpau-driver: vdpau back-end for nvidia'
-            'lirc: for lirc plugin'
            'ncurses: for ncurses interface support'
-            'opus: for opus support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards'
+            'libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin'
            'portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'projectm: for ProjectM visualisation plugin'
+            'libcaca: for colored ASCII art video output'
+            'libgme: for libgme plugin'
+            'librsvg: for SVG plugin'
+            'libgoom2: for libgoom plugin'
+            'vcdimager: navigate VCD with libvcdinfo'
+            'aalib: for ASCII art plugin'
+            'libmtp: for MTP devices support'
            'smbclient: for SMB access plugin'
-            'ttf-dejavu: for subtitle font'
+            'libcdio: for audio CD playback support'
            'ttf-freefont: for subtitle font '
-            'vcdimager: navigate VCD with libvcdinfo')
+            'ttf-dejavu: for subtitle font'
+            'opus: for opus support'
+            'libssh2: for sftp support'
+            'lua-socket: for http interface')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
        'usr/share/vlc/lua/http/dialogs/.hosts')
 categories=('multimedia')
@ -56,10 +64,10 @@ prepare() {
  
  patch -p1 -i $srcdir/vlc-2.2.1-CVE-2015-5949.patch

-  autoreconf -fi
+  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
+  sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp

-  #sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-  #sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+  autoreconf -fi
 }


@ -75,11 +83,9 @@ build() {
              --enable-lirc \
              --enable-ncurses \
              --enable-realrtsp \
-              --enable-gles2 \
-              --enable-gles1 \
+              --enable-aa \
              --enable-vcdx \
              --enable-upnp \
-              --enable-bluray \
              --enable-opus \
              --enable-sftp \
              --with-x
@ -96,8 +102,4 @@ package() {
    install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \
        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
  done
-  rm -v ${pkgdir}/usr/share/vlc/skins2/fonts/FreeSans*
-  ln -sv /usr/share/fonts/TTF/FreeSans.ttf ${pkgdir}/usr/share/vlc/skins2/fonts/FreeSans.ttf
-  ln -sv /usr/share/fonts/TTF/FreeSansBold.ttf ${pkgdir}/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
 }
- 	
--- a/vlc/PKGBUILD-qt5
+++ b/vlc/PKGBUILD-qt5
@ -0,0 +1,107 @@
+# Contributions from ArchLinux: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/vlc
+
+pkgname=vlc
+pkgver=2.2.1
+pkgrel=10
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('x86_64')
+url="http://www.videolan.org/vlc/"
+license=('LGPL2.1' 'GPL2')
+depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt5-base' 'qt5-x11extras' 'libproxy'
+         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+         'libxinerama')
+makedepends=('live-media' 'libnotify' 'libbluray' 'flac'
+             'libdc1394' 'libavc1394' 'lirc' 'libcaca'
+             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm'
+             'twolame' 'aalib' 'libmtp' 'libdvdcss' 'qt4'
+             'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'gtk2: for notify plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-intel-driver: back-end for intel cards'
+            'libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin'
+            'portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin'
+            'projectm: for ProjectM visualisation plugin'
+            'libcaca: for colored ASCII art video output'
+            'libgme: for libgme plugin'
+            'librsvg: for SVG plugin'
+            'gnome-vfs: for GNOME Virtual File System support'
+            'libgoom2: for libgoom plugin'
+            'vcdimager: navigate VCD with libvcdinfo'
+            'aalib: for ASCII art plugin'
+            'libmtp: for MTP devices support'
+            'smbclient: for SMB access plugin'
+            'libcdio: for audio CD playback support'
+            'ttf-freefont: for subtitle font '
+            'ttf-dejavu: for subtitle font'
+            'opus: for opus support'
+            'libssh2: for sftp support'
+            'lua-socket: for http interface')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+backup=('usr/share/vlc/lua/http/.hosts'
+        'usr/share/vlc/lua/http/dialogs/.hosts')
+categories=('multimedia')
+options=('!emptydirs')
+install="vlc.install"
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
+        'vlc-2.2.1-CVE-2015-5949.patch')
+sha1sums=('ee8535c5966217bc2069a74c1d4e8c32609656e9'
+          '43c5ac8ae6a24228bc6219f027d0edb215f1c62b')
+screenshot='http://images1.videolan.org/vlc/screenshots/0.9.2/screenshot-kde4.jpg'
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+  
+  patch -p1 -i $srcdir/vlc-2.2.1-CVE-2015-5949.patch
+
+  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
+  sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
+
+  autoreconf -fi
+}
+
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+  
+  CFLAGS+=" -I/usr/include/samba-4.0" CPPFLAGS+=" -I/usr/include/samba-4.0" \
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --disable-rpath \
+              --enable-faad \
+              --enable-nls \
+              --enable-lirc \
+              --enable-ncurses \
+              --enable-realrtsp \
+              --enable-aa \
+              --enable-vcdx \
+              --enable-upnp \
+              --enable-opus \
+              --enable-sftp \
+              --with-x
+              LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
+
+  make DESTDIR="${pkgdir}" install
+
+  for res in 16 32 48 128; do
+    install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \
+        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+  done
+}
--- a/xosd/PKGBUILD
+++ b/xosd/PKGBUILD
@ -0,0 +1,29 @@
+# Arch contributor: https://projects.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/xosd
+
+pkgname=xosd
+pkgver=2.2.14
+pkgrel=1
+pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://sourceforge.net/projects/libxosd/"
+depends=('libxt' 'libxinerama' 'sh')
+source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz"
+	"http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver-2.debian.tar.gz")
+md5sums=('4b349fe930e4eee2f504d6c02673e24d'
+         'cd3c37f4e4bbfba6f3ffd7ec43256cc2')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/debian/patches/25_fix_mangapges.diff
+  patch -p1 <$srcdir/debian/patches/328676.diff
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \
+    "$pkgdir/usr/share/aclocal/libxosd.m4"
+}