[arch-commits] Commit in mediastreamer/trunk (PKGBUILD disable-v4l1.patch)

[Andrea Scarpino]

    Date: Sunday, December 25, 2011 @ 06:00:39
  Author: andrea
Revision: 145636

upgpkg: mediastreamer 2.8.0-1

Upstream release

Modified:
  mediastreamer/trunk/PKGBUILD
Deleted:
  mediastreamer/trunk/disable-v4l1.patch

--------------------+
 PKGBUILD           |   23 ++++++++++-------------
 disable-v4l1.patch |   50 --------------------------------------------------
 2 files changed, 10 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-25 10:59:41 UTC (rev 145635)
+++ PKGBUILD	2011-12-25 11:00:39 UTC (rev 145636)
@@ -5,26 +5,23 @@
 # Contributor: Adrià Arrufat <swiftscythe at gmail.com>
 
 pkgname=mediastreamer
-pkgver=2.7.3
-pkgrel=4
+pkgver=2.8.0
+pkgrel=1
 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/"
 license=('GPL')
-depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "disable-v4l1.patch")
-md5sums=('5213307f557d86aa648f1a53a885138c'
-         '7ee15689eed1adbdcf0ddab8fadca34a')
+depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
+makedepends=('intltool')
+#source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('79f6e4d927ebf15e9967511d8a88ce74')
 options=('!libtool')
 
 build() {
-  cd "${srcdir}"/$pkgname-$pkgver/
-  patch -p2 -i "${srcdir}"/disable-v4l1.patch
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib/mediastreamer/
+  cd "${srcdir}"/$pkgname-$pkgver
+  ./autogen.sh
+  ./configure --prefix=/usr
   make
 }
 

Deleted: disable-v4l1.patch
===================================================================
--- disable-v4l1.patch	2011-12-25 10:59:41 UTC (rev 145635)
+++ disable-v4l1.patch	2011-12-25 11:00:39 UTC (rev 145636)
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am	2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am	2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
- 
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
- 
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in	2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in	2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE at am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE at am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE at am__append_14 = msv4m.m
-- at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__append_15 = msv4l.c msv4l2.c
-+ at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE at am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE at am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE at am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- 	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- 	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- 	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
--	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- 	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- 	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- 	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE at am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE at am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE at am__objects_14 = msv4m.lo
-- at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__objects_15 = msv4l.lo msv4l2.lo
-+ at BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE at am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE at am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@	drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE at am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mssndcard.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msspeex.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msticker.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msv4l.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msv4l2.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msv4m.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/msvideo.Plo at am__quote@