mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-05 21:47:13 +08:00
mediastreamer update, kdenetwork rebuild, re-added deps, gcc47.patch
This commit is contained in:
Anke
parent
17020ee01d
commit
977675b501
@ -21,7 +21,7 @@ pkgname=('kdenetwork-filesharing'
|
||||
|
||||
arch=('i686' 'x86_64')
|
||||
pkgver=${_kdever}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="split package"
|
||||
url="http://www.kde.org"
|
||||
license=('GPL' 'LGPL' 'FDL')
|
||||
@ -30,13 +30,15 @@ options=('docs' '!splithdr' 'splitdbg' 'log')
|
||||
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca-ossl'
|
||||
"kde-workspace>=${_kdever}" "kde-baseapps>=${_kdever}" 'libvncserver' 'libmsn' 'libmms'
|
||||
'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'libgadu'
|
||||
'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'docbook-xsl')
|
||||
'mediastreamer' 'msilbc' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5' 'docbook-xsl')
|
||||
|
||||
source=("$_mirror/${pkgbase}-$_kdever.tar.xz"
|
||||
'lisa.daemon')
|
||||
'lisa.daemon'
|
||||
'gcc47.patch')
|
||||
|
||||
md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
|
||||
'66069c83fd5fa0df5d743d4486799033') # lisa.daemon
|
||||
'66069c83fd5fa0df5d743d4486799033' # lisa.daemon
|
||||
'54da759d422b8fdc46cdd68a85211766') #gcc47.patch
|
||||
|
||||
|
||||
#
|
||||
@ -44,12 +46,13 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
|
||||
#
|
||||
build() {
|
||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
||||
|
||||
patch -p4 -i "${srcdir}"/gcc47.patch
|
||||
msg "starting build ..."
|
||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
||||
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
||||
-DWITH_Xmms=OFF \
|
||||
-DWITH_LibMeanwhile=OFF \
|
||||
-DWITH_qq=OFF \
|
||||
-DWITH_meanwhile=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
|
||||
|
||||
@ -107,7 +110,8 @@ package_kdenetwork-kopete() {
|
||||
pkgdesc="Kopete, the instant messenger"
|
||||
url="http://kde.org/applications/internet/kopete/"
|
||||
depends=("kde-runtime>=${_kdever}" "kdepimlibs>=${_kdever}"
|
||||
'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'libgadu')
|
||||
'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss'
|
||||
'libv4l' 'mediastreamer' 'msilbc' 'libgadu')
|
||||
groups=("kde" "${pkgbase}" "kde-uninstall")
|
||||
categories=('communication')
|
||||
conflicts=("kdenetwork-common" "kdenetwork-doc")
|
||||
|
||||
59
kdenetwork/gcc47.patch
Normal file
59
kdenetwork/gcc47.patch
Normal file
@ -0,0 +1,59 @@
|
||||
--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761
|
||||
+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
+#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include <cstring>
|
||||
--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761
|
||||
+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762
|
||||
@@ -27,6 +27,12 @@
|
||||
|
||||
#include "talk/base/ssladapter.h"
|
||||
|
||||
+#ifdef POSIX
|
||||
+extern "C" {
|
||||
+#include <unistd.h>
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
|
||||
#ifdef WIN32
|
||||
#define SSL_USE_SCHANNEL 1
|
||||
--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761
|
||||
+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762
|
||||
@@ -198,15 +198,6 @@
|
||||
}
|
||||
|
||||
template<class CTYPE>
|
||||
-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
|
||||
- va_list args;
|
||||
- va_start(args, format);
|
||||
- size_t len = vsprintfn(buffer, buflen, format, args);
|
||||
- va_end(args);
|
||||
- return len;
|
||||
-}
|
||||
-
|
||||
-template<class CTYPE>
|
||||
size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
|
||||
va_list args) {
|
||||
int len = vsnprintf(buffer, buflen, format, args);
|
||||
@@ -217,6 +208,15 @@
|
||||
return len;
|
||||
}
|
||||
|
||||
+template<class CTYPE>
|
||||
+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
|
||||
+ va_list args;
|
||||
+ va_start(args, format);
|
||||
+ size_t len = vsprintfn(buffer, buflen, format, args);
|
||||
+ va_end(args);
|
||||
+ return len;
|
||||
+}
|
||||
+
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Allow safe comparing and copying ascii (not UTF-8) with both wide and
|
||||
// non-wide character strings.
|
||||
@ -1,32 +0,0 @@
|
||||
#
|
||||
# KDE SC Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=mediastreamer
|
||||
pkgver=2.7.3
|
||||
pkgrel=4
|
||||
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>=0.8.9' 'libxv')
|
||||
makedepends=('cmake' 'automoc4')
|
||||
source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz"
|
||||
disable-v4l1.patch)
|
||||
md5sums=('5213307f557d86aa648f1a53a885138c'
|
||||
'0dd7e7bb49f148cc8ed9d749e463f481')
|
||||
|
||||
build() {
|
||||
|
||||
cd "$srcdir"/$pkgname-$pkgver/
|
||||
patch -p2 -i "${srcdir}"/disable-v4l1.patch
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}"/$pkgname-$pkgver
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
@ -1,51 +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@am__append_12 = aqsnd.c
|
||||
@BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
|
||||
@BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
|
||||
-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
|
||||
+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
|
||||
@BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
|
||||
@BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
|
||||
@BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@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@am__objects_12 = aqsnd.lo
|
||||
@BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
|
||||
@BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
|
||||
-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
|
||||
+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
|
||||
@BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
|
||||
@BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo
|
||||
@BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
|
||||
@@ -600,7 +600,6 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user