[arch-commits] Commit in vlc/repos (10 files)

Ionut Biru ibiru at archlinux.org
Wed Feb 22 11:22:08 UTC 2012


    Date: Wednesday, February 22, 2012 @ 06:22:08
  Author: ibiru
Revision: 150788

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  vlc/repos/extra-i686/PKGBUILD
    (from rev 150787, vlc/trunk/PKGBUILD)
  vlc/repos/extra-i686/access_smb_link_to_smbclient.patch
    (from rev 150787, vlc/trunk/access_smb_link_to_smbclient.patch)
  vlc/repos/extra-i686/vlc.install
    (from rev 150787, vlc/trunk/vlc.install)
  vlc/repos/extra-x86_64/PKGBUILD
    (from rev 150787, vlc/trunk/PKGBUILD)
  vlc/repos/extra-x86_64/access_smb_link_to_smbclient.patch
    (from rev 150787, vlc/trunk/access_smb_link_to_smbclient.patch)
  vlc/repos/extra-x86_64/vlc.install
    (from rev 150787, vlc/trunk/vlc.install)
Deleted:
  vlc/repos/extra-i686/PKGBUILD
  vlc/repos/extra-i686/vlc.install
  vlc/repos/extra-x86_64/PKGBUILD
  vlc/repos/extra-x86_64/vlc.install

-------------------------------------------------+
 extra-i686/PKGBUILD                             |  155 +++++++++++-----------
 extra-i686/access_smb_link_to_smbclient.patch   |   15 ++
 extra-i686/vlc.install                          |   36 ++---
 extra-x86_64/PKGBUILD                           |  155 +++++++++++-----------
 extra-x86_64/access_smb_link_to_smbclient.patch |   15 ++
 extra-x86_64/vlc.install                        |   36 ++---
 6 files changed, 226 insertions(+), 186 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-22 11:18:56 UTC (rev 150787)
+++ extra-i686/PKGBUILD	2012-02-22 11:22:08 UTC (rev 150788)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
-
-pkgname=vlc
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca' 'oss')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray disks' 
-            'oss: for OSS audio')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('8806bff2ea9c76791123d444a92f708c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --enable-upnp \
-              --enable-oss \
-              --enable-bluray \
-              --enable-live555 \
-              --enable-realrtsp
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}

Copied: vlc/repos/extra-i686/PKGBUILD (from rev 150787, vlc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-22 11:22:08 UTC (rev 150788)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
+
+pkgname=vlc
+pkgver=2.0.0
+pkgrel=4
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/vlc/"
+license=('GPL')
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
+         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
+         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
+             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
+             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
+             'lirc-utils' 'gnutls' 'libcaca' 'oss')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libpulse: PulseAudio support'
+            'vdpau-video: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards'
+            'libbluray: for Blu-Ray disks' 
+            'oss: for OSS audio')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+backup=('usr/share/vlc/lua/http/.hosts'
+        'usr/share/vlc/lua/http/dialogs/.hosts')
+options=('!libtool')
+install=vlc.install
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        access_smb_link_to_smbclient.patch)
+md5sums=('8806bff2ea9c76791123d444a92f708c'
+         '5f510fdea99cdb7941423eb40045968a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
+
+  patch -Np1 -i "${srcdir}/access_smb_link_to_smbclient.patch"
+  autoreconf -fi
+
+  ./configure --prefix=/usr \
+              --disable-rpath \
+              --enable-faad \
+              --enable-dbus-control \
+              --enable-nls \
+              --enable-lirc \
+              --enable-pvr \
+              --enable-ncurses \
+              --enable-upnp \
+              --enable-oss \
+              --enable-bluray \
+              --enable-live555 \
+              --enable-realrtsp
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+
+  for res in 16 32 48 128; do
+    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+  done
+}

Copied: vlc/repos/extra-i686/access_smb_link_to_smbclient.patch (from rev 150787, vlc/trunk/access_smb_link_to_smbclient.patch)
===================================================================
--- extra-i686/access_smb_link_to_smbclient.patch	                        (rev 0)
+++ extra-i686/access_smb_link_to_smbclient.patch	2012-02-22 11:22:08 UTC (rev 150788)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
+
+diff --git a/modules/access/Modules.am b/modules/access/Modules.am
+index 81d8e78..be8c47b 100644
+--- a/modules/access/Modules.am
++++ b/modules/access/Modules.am
+@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
+ 
+ libaccess_smb_plugin_la_SOURCES = smb.c
+ libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
+-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
++libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
+ if HAVE_WIN32
+ libaccess_smb_plugin_la_LIBADD += -lmpr
+ endif

Deleted: extra-i686/vlc.install
===================================================================
--- extra-i686/vlc.install	2012-02-22 11:18:56 UTC (rev 150787)
+++ extra-i686/vlc.install	2012-02-22 11:22:08 UTC (rev 150788)
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}

Copied: vlc/repos/extra-i686/vlc.install (from rev 150787, vlc/trunk/vlc.install)
===================================================================
--- extra-i686/vlc.install	                        (rev 0)
+++ extra-i686/vlc.install	2012-02-22 11:22:08 UTC (rev 150788)
@@ -0,0 +1,18 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f usr/lib/vlc/plugins/plugins-*.dat
+}
+
+post_remove() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-22 11:18:56 UTC (rev 150787)
+++ extra-x86_64/PKGBUILD	2012-02-22 11:22:08 UTC (rev 150788)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
-
-pkgname=vlc
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca' 'oss')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libpulse: PulseAudio support'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray disks' 
-            'oss: for OSS audio')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('8806bff2ea9c76791123d444a92f708c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --enable-upnp \
-              --enable-oss \
-              --enable-bluray \
-              --enable-live555 \
-              --enable-realrtsp
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}

Copied: vlc/repos/extra-x86_64/PKGBUILD (from rev 150787, vlc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-22 11:22:08 UTC (rev 150788)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
+
+pkgname=vlc
+pkgver=2.0.0
+pkgrel=4
+pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/vlc/"
+license=('GPL')
+depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
+         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
+         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
+         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
+         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'  'xcb-util-keysyms'
+         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
+makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'libbluray'
+             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
+             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
+             'lirc-utils' 'gnutls' 'libcaca' 'oss')
+optdepends=('avahi: for service discovery using bonjour protocol'
+            'libnotify: for notification plugin'
+            'ncurses: for ncurses interface support'
+            'libdvdcss: for decoding encrypted DVDs'
+            'lirc-utils: for lirc plugin'
+            'libavc1394: for devices using the 1394ta AV/C'
+            'libdc1394: for IEEE 1394 plugin'
+            'kdelibs: KDE Solid hardware integration'
+            'libpulse: PulseAudio support'
+            'vdpau-video: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards'
+            'libbluray: for Blu-Ray disks' 
+            'oss: for OSS audio')
+conflicts=('vlc-plugin')
+replaces=('vlc-plugin')
+backup=('usr/share/vlc/lua/http/.hosts'
+        'usr/share/vlc/lua/http/dialogs/.hosts')
+options=('!libtool')
+install=vlc.install
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        access_smb_link_to_smbclient.patch)
+md5sums=('8806bff2ea9c76791123d444a92f708c'
+         '5f510fdea99cdb7941423eb40045968a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
+
+  patch -Np1 -i "${srcdir}/access_smb_link_to_smbclient.patch"
+  autoreconf -fi
+
+  ./configure --prefix=/usr \
+              --disable-rpath \
+              --enable-faad \
+              --enable-dbus-control \
+              --enable-nls \
+              --enable-lirc \
+              --enable-pvr \
+              --enable-ncurses \
+              --enable-upnp \
+              --enable-oss \
+              --enable-bluray \
+              --enable-live555 \
+              --enable-realrtsp
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+
+  for res in 16 32 48 128; do
+    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+  done
+}

Copied: vlc/repos/extra-x86_64/access_smb_link_to_smbclient.patch (from rev 150787, vlc/trunk/access_smb_link_to_smbclient.patch)
===================================================================
--- extra-x86_64/access_smb_link_to_smbclient.patch	                        (rev 0)
+++ extra-x86_64/access_smb_link_to_smbclient.patch	2012-02-22 11:22:08 UTC (rev 150788)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
+
+diff --git a/modules/access/Modules.am b/modules/access/Modules.am
+index 81d8e78..be8c47b 100644
+--- a/modules/access/Modules.am
++++ b/modules/access/Modules.am
+@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
+ 
+ libaccess_smb_plugin_la_SOURCES = smb.c
+ libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
+-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
++libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
+ if HAVE_WIN32
+ libaccess_smb_plugin_la_LIBADD += -lmpr
+ endif

Deleted: extra-x86_64/vlc.install
===================================================================
--- extra-x86_64/vlc.install	2012-02-22 11:18:56 UTC (rev 150787)
+++ extra-x86_64/vlc.install	2012-02-22 11:22:08 UTC (rev 150788)
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}

Copied: vlc/repos/extra-x86_64/vlc.install (from rev 150787, vlc/trunk/vlc.install)
===================================================================
--- extra-x86_64/vlc.install	                        (rev 0)
+++ extra-x86_64/vlc.install	2012-02-22 11:22:08 UTC (rev 150788)
@@ -0,0 +1,18 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f usr/lib/vlc/plugins/plugins-*.dat
+}
+
+post_remove() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}




More information about the arch-commits mailing list