[arch-commits] Commit in skype-call-recorder/trunk (3 files)

[Evangelos Foutras]

    Date: Tuesday, October 15, 2013 @ 18:31:22
  Author: foutrelis
Revision: 98627

upgpkg: skype-call-recorder 0.9-1

(Not so) new upstream release.

Added:
  skype-call-recorder/trunk/skype-call-recorder-0.9-dso-fix.patch
Modified:
  skype-call-recorder/trunk/PKGBUILD
Deleted:
  skype-call-recorder/trunk/skype-call-recorder-0.8-dso-fix.patch

---------------------------------------+
 PKGBUILD                              |   14 ++++----
 skype-call-recorder-0.8-dso-fix.patch |   12 ------
 skype-call-recorder-0.9-dso-fix.patch |   55 ++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-15 15:29:46 UTC (rev 98626)
+++ PKGBUILD	2013-10-15 16:31:22 UTC (rev 98627)
@@ -3,8 +3,8 @@
 # Contributor: Tarinaky <tarinaky at hunity.co.uk>
 
 pkgname=skype-call-recorder
-pkgver=0.8
-pkgrel=3
+pkgver=0.9
+pkgrel=1
 pkgdesc="Open source tool that allows you to record your Skype calls on Linux"
 arch=('i686' 'x86_64')
 url="http://atdot.ch/scr/"
@@ -12,15 +12,15 @@
 depends=('qt4' 'libvorbis' 'lame' 'id3lib' 'hicolor-icon-theme')
 makedepends=('cmake')
 install=skype-call-recorder.install
-source=(http://atdot.ch/scr/files/$pkgver/$pkgname-$pkgver.tar.gz
-        skype-call-recorder-0.8-dso-fix.patch)
-sha256sums=('b115f728e09602cca7aa51479faa868de1f9b7cf887ed3d7c82f4935309c32c6'
-            '1cde36728cf88f479bf317efcacd0cdca8fc7bcd74a6f273beb150ecf8c781da')
+source=($pkgname-$pkgver.tar.gz::https://github.com/jlherren/$pkgname/archive/$pkgver.tar.gz
+        skype-call-recorder-0.9-dso-fix.patch)
+sha256sums=('b143a75f66c16c7ae3d6a55aac50b0217b9e1097c838a9e406f00ce1561ac98e'
+            'a2d4d5640970c90205285945b08891238287b488beb958abd42e08565aef747b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/skype-call-recorder-0.8-dso-fix.patch"
+  patch -Np1 -i "$srcdir/skype-call-recorder-0.9-dso-fix.patch"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr
   make

Deleted: skype-call-recorder-0.8-dso-fix.patch
===================================================================
--- skype-call-recorder-0.8-dso-fix.patch	2013-10-15 15:29:46 UTC (rev 98626)
+++ skype-call-recorder-0.8-dso-fix.patch	2013-10-15 16:31:22 UTC (rev 98627)
@@ -1,12 +0,0 @@
-diff -upr skype-call-recorder-0.8.orig/CMakeLists.txt skype-call-recorder-0.8/CMakeLists.txt
---- skype-call-recorder-0.8.orig/CMakeLists.txt	2013-02-19 08:42:53.000000000 +0200
-+++ skype-call-recorder-0.8/CMakeLists.txt	2013-02-19 08:56:55.000000000 +0200
-@@ -75,7 +75,7 @@ SET(LIBRARIES ${LIBRARIES} ${ID3_LIBRARY
- 
- FIND_PACKAGE(vorbisenc REQUIRED)
- INCLUDE_DIRECTORIES(${VORBISENC_INCLUDE_DIR})
--SET(LIBRARIES ${LIBRARIES} ${VORBISENC_LIBRARY})
-+SET(LIBRARIES ${LIBRARIES} ${VORBISENC_LIBRARY} vorbis ogg)
- 
- # Qt
- 

Added: skype-call-recorder-0.9-dso-fix.patch
===================================================================
--- skype-call-recorder-0.9-dso-fix.patch	                        (rev 0)
+++ skype-call-recorder-0.9-dso-fix.patch	2013-10-15 16:31:22 UTC (rev 98627)
@@ -0,0 +1,55 @@
+From 671531892b78eeb12fbdeb025547d3b1201409bf Mon Sep 17 00:00:00 2001
+From: jlh <jlh at gmx.ch>
+Date: Wed, 10 Jul 2013 13:45:41 +0200
+Subject: [PATCH] Fix linking issue with ogg/vorbis libraries
+
+---
+ CMakeLists.txt                   |  2 +-
+ CMakeModules/Findvorbisenc.cmake | 10 ++++++----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index abcf2e3..33b79cb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,7 +81,7 @@ SET(LIBRARIES ${LIBRARIES} ${ID3_LIBRARY})
+ 
+ FIND_PACKAGE(vorbisenc REQUIRED)
+ INCLUDE_DIRECTORIES(${VORBISENC_INCLUDE_DIR})
+-SET(LIBRARIES ${LIBRARIES} ${VORBISENC_LIBRARY})
++SET(LIBRARIES ${LIBRARIES} ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISENC_LIBRARY})
+ 
+ # Qt
+ 
+diff --git a/CMakeModules/Findvorbisenc.cmake b/CMakeModules/Findvorbisenc.cmake
+index d519b39..53210f0 100644
+--- a/CMakeModules/Findvorbisenc.cmake
++++ b/CMakeModules/Findvorbisenc.cmake
+@@ -1,18 +1,20 @@
+ 
+ FIND_PATH(VORBISENC_INCLUDE_DIR vorbis/vorbisenc.h /usr/include /usr/local/include)
++FIND_LIBRARY(OGG_LIBRARY NAMES ogg PATH /usr/lib /usr/local/lib)
++FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis PATH /usr/lib /usr/local/lib)
+ FIND_LIBRARY(VORBISENC_LIBRARY NAMES vorbisenc PATH /usr/lib /usr/local/lib)
+ 
+-IF (VORBISENC_INCLUDE_DIR AND VORBISENC_LIBRARY)
++IF (VORBISENC_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY AND VORBISENC_LIBRARY)
+ 	SET(VORBISENC_FOUND TRUE)
+-ENDIF (VORBISENC_INCLUDE_DIR AND VORBISENC_LIBRARY)
++ENDIF (VORBISENC_INCLUDE_DIR AND OGG_LIBRARY AND VORBIS_LIBRARY AND VORBISENC_LIBRARY)
+ 
+ IF (VORBISENC_FOUND)
+ 	IF (NOT vorbisenc_FIND_QUIETLY)
+-		MESSAGE(STATUS "Found vorbisenc: ${VORBISENC_INCLUDE_DIR}/vorbis/vorbisenc.h ${VORBISENC_LIBRARY}")
++		MESSAGE(STATUS "Found vorbisenc: ${VORBISENC_INCLUDE_DIR}/vorbis/vorbisenc.h ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISENC_LIBRARY}")
+ 	ENDIF (NOT vorbisenc_FIND_QUIETLY)
+ ELSE (VORBISENC_FOUND)
+ 	IF (vorbisenc_FIND_REQUIRED)
+-		MESSAGE(FATAL_ERROR "Could not find vorbisenc")
++		MESSAGE(FATAL_ERROR "Could not find ogg, vorbis or vorbisenc")
+ 	ENDIF (vorbisenc_FIND_REQUIRED)
+ ENDIF (VORBISENC_FOUND)
+ 
+-- 
+1.8.4
+