mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-21 19:42:24 +01:00
multimedia/telepathy-qt: Updated for version 0.9.6.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo
parent
eda86659c9
commit
43a953e278
4 changed files with 122 additions and 4 deletions
26
multimedia/telepathy-qt/glibc.patch
Normal file
26
multimedia/telepathy-qt/glibc.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001
|
||||
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
|
||||
Date: Fri, 5 Jun 2015 12:47:13 +0200
|
||||
Subject: CMake: Fixed deprecated _BSD_SOURCE.
|
||||
|
||||
Since glibc-2.20 _DEFAULT_SOURCE definition is also required.
|
||||
|
||||
Reviewed-by: Alexandr Akulich
|
||||
|
||||
diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake
|
||||
index d34b24d..dc98697 100644
|
||||
--- a/cmake/modules/TelepathyDefaults.cmake
|
||||
+++ b/cmake/modules/TelepathyDefaults.cmake
|
||||
@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
endif(${NOT_RELEASE} EQUAL 1)
|
||||
|
||||
if(CMAKE_SYSTEM_NAME MATCHES Linux)
|
||||
- add_definitions(-D_BSD_SOURCE)
|
||||
+ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE)
|
||||
endif(CMAKE_SYSTEM_NAME MATCHES Linux)
|
||||
|
||||
# Compiler coverage
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
|
||||
84
multimedia/telepathy-qt/gstreamer.patch
Normal file
84
multimedia/telepathy-qt/gstreamer.patch
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
From ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb Mon Sep 17 00:00:00 2001
|
||||
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
|
||||
Date: Tue, 29 Sep 2015 20:52:15 +0200
|
||||
Subject: Farstream: gst/gstconfig.h can be in LIBDIR, search for it explicitly
|
||||
|
||||
Since GStreamer-1.5.1 config header file moved to LIBDIR.
|
||||
|
||||
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
|
||||
|
||||
diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
|
||||
index 250bfdb..dd71430 100644
|
||||
--- a/TelepathyQt/Farstream/CMakeLists.txt
|
||||
+++ b/TelepathyQt/Farstream/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND)
|
||||
include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR}
|
||||
${TELEPATHY_GLIB_INCLUDE_DIR}
|
||||
${FARSTREAM_INCLUDE_DIR}
|
||||
- ${GSTREAMER_INCLUDE_DIR}
|
||||
+ ${GSTREAMER_INCLUDE_DIRS}
|
||||
${GLIB2_INCLUDE_DIR}
|
||||
${LIBXML2_INCLUDE_DIR}
|
||||
${DBUS_INCLUDE_DIR})
|
||||
diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
|
||||
index 63fb41c..ffdd7a9 100644
|
||||
--- a/cmake/modules/FindGStreamer.cmake
|
||||
+++ b/cmake/modules/FindGStreamer.cmake
|
||||
@@ -13,12 +13,12 @@
|
||||
|
||||
# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
|
||||
|
||||
-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
|
||||
+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
|
||||
# in cache already
|
||||
SET(GSTREAMER_FIND_QUIETLY TRUE)
|
||||
-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
|
||||
+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
|
||||
SET(GSTREAMER_FIND_QUIETLY FALSE)
|
||||
-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
|
||||
+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
|
||||
|
||||
IF (NOT WIN32)
|
||||
# use pkg-config to get the directories and then use these values
|
||||
@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
|
||||
PATH_SUFFIXES gstreamer-1.0
|
||||
)
|
||||
|
||||
+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
|
||||
+ PATHS
|
||||
+ ${PC_GSTREAMER_INCLUDEDIR}
|
||||
+ ${PC_GSTREAMER_INCLUDE_DIRS}
|
||||
+ PATH_SUFFIXES gstreamer-1.0
|
||||
+ )
|
||||
+
|
||||
+SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR})
|
||||
+
|
||||
FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
|
||||
PATHS
|
||||
${PC_GSTREAMER_LIBDIR}
|
||||
@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR)
|
||||
MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
|
||||
ENDIF (GSTREAMER_INCLUDE_DIR)
|
||||
|
||||
+IF (GSTREAMER_CONF_INCLUDE_DIR)
|
||||
+ #MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}")
|
||||
+ELSE (GSTREAMER_CONF_INCLUDE_DIR)
|
||||
+ MESSAGE(STATUS "GStreamer: WARNING: config include dir not found")
|
||||
+ENDIF (GSTREAMER_CONF_INCLUDE_DIR)
|
||||
+
|
||||
IF (GSTREAMER_LIBRARIES)
|
||||
#MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
|
||||
ELSE (GSTREAMER_LIBRARIES)
|
||||
@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES)
|
||||
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
|
||||
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY)
|
||||
|
||||
-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
|
||||
+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=telepathy-qt
|
||||
VERSION=${VERSION:-0.9.6}
|
||||
VERSION=${VERSION:-0.9.6.1}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
|
@ -69,6 +69,11 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# Fix around new glibc and gstreamer
|
||||
# Thanks to ARCH Linux
|
||||
patch -p1 < $CWD/glibc.patch
|
||||
patch -p1 < $CWD/gstreamer.patch
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake \
|
||||
|
|
@ -76,7 +81,10 @@ cd build
|
|||
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DDESIRED_QT_VERSION=4 \
|
||||
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
|
||||
-DENABLE_EXAMPLES=OFF \
|
||||
-DENABLE_TESTS=OFF \
|
||||
..
|
||||
make
|
||||
make install DESTDIR=$PKG
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="telepathy-qt"
|
||||
VERSION="0.9.6"
|
||||
VERSION="0.9.6.1"
|
||||
HOMEPAGE="http://telepathy.freedesktop.org/doc/telepathy-qt/"
|
||||
DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.tar.gz"
|
||||
MD5SUM="1f18935f30dcf90282a2d6d65fcde752"
|
||||
DOWNLOAD="http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.6.1.tar.gz"
|
||||
MD5SUM="bebebfbe29d194a9ba00b4f422a44f74"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES="telepathy-farstream"
|
||||
|
|
|
|||
Loading…
Reference in a new issue