mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
net-im/psimedia:
- add upstream patches to fix build with modern gcc, glib, and make -j - add explicit dependence on audio/speex - convert WITH_DEBUG to option - convert to USES=tar:bzip2
This commit is contained in:
Max Brazhnikov
parent
22fbdf68ba
commit
ada6c6433a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=349733
@ -9,10 +9,10 @@ MASTER_SITES= http://delta.affinix.com/download/psimedia/
|
||||
MAINTAINER= makc@FreeBSD.org
|
||||
COMMENT= Voice and video API for Psi-like IM clients
|
||||
|
||||
LIB_DEPENDS= liboil-0.3.so:${PORTSDIR}/devel/liboil
|
||||
LIB_DEPENDS= liboil-0.3.so:${PORTSDIR}/devel/liboil \
|
||||
libspeexdsp.so:${PORTSDIR}/audio/speex
|
||||
|
||||
USES= pkgconfig
|
||||
USE_BZIP2= yes
|
||||
USES= pkgconfig tar:bzip2
|
||||
HAS_CONFIGURE= yes
|
||||
USE_QT4= gui qmake_build moc_build uic_build
|
||||
USE_GSTREAMER= jpeg speex theora vorbis
|
||||
@ -20,31 +20,22 @@ USE_GSTREAMER= jpeg speex theora vorbis
|
||||
QT_NONSTANDARD= yes
|
||||
CONFIGURE_ARGS= --qtdir=${LOCALBASE} \
|
||||
--verbose
|
||||
MAKE_JOBS_UNSAFE= yes
|
||||
DESTDIRNAME= INSTALL_ROOT
|
||||
|
||||
PSI_PLUGIN_DIR= lib/psi/plugins
|
||||
|
||||
.if !defined(WITH_DEBUG)
|
||||
CONFIGURE_ARGS+= --release
|
||||
PLIST_SUB+= DEBUG="@comment "
|
||||
.else
|
||||
CONFIGURE_ARGS+= --debug
|
||||
PLIST_SUB+= DEBUG=""
|
||||
.endif
|
||||
OPTIONS_DEFINE= DEBUG
|
||||
OPTIONS_SUB= yes
|
||||
DEBUG_CONFIGURE_ON= --debug
|
||||
DEBUG_CONFIGURE_OFF= --release
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
|
||||
${WRKSRC}/gstprovider/rwcontrol.h \
|
||||
${WRKSRC}/gstprovider/gstthread.h \
|
||||
${WRKSRC}/gstprovider/gstelements/static/gstelements.h \
|
||||
${WRKSRC}/gstprovider/gstcustomelements/gstcustomelements.h
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${PREFIX}/${PSI_PLUGIN_DIR}
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/gstprovider/libgstprovider.so \
|
||||
${INSTALL_LIB} ${WRKSRC}/gstprovider/libgstprovider.so \
|
||||
${STAGEDIR}${PREFIX}/${PSI_PLUGIN_DIR}
|
||||
.if defined(WITH_DEBUG)
|
||||
.if ${PORT_OPTIONS:MDEBUG}
|
||||
${INSTALL_DATA} ${WRKSRC}/gstprovider/libgstprovider.so.debug \
|
||||
${STAGEDIR}${PREFIX}/${PSI_PLUGIN_DIR}
|
||||
.endif
|
||||
|
||||
88
net-im/psimedia/files/patch-git_a986555ab7
Normal file
88
net-im/psimedia/files/patch-git_a986555ab7
Normal file
@ -0,0 +1,88 @@
|
||||
diff --git a/gstprovider/bins.cpp b/gstprovider/bins.cpp
|
||||
index f91bc7a..5a6880f 100644
|
||||
--- gstprovider/bins.cpp
|
||||
+++ gstprovider/bins.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "bins.h"
|
||||
|
||||
+#include <stdio.h>
|
||||
#include <QString>
|
||||
#include <QSize>
|
||||
#include <gst/gst.h>
|
||||
diff --git a/gstprovider/gstcustomelements/gstcustomelements.h b/gstprovider/gstcustomelements/gstcustomelements.h
|
||||
index 85a7bc5..0bd7ccc 100644
|
||||
--- gstprovider/gstcustomelements/gstcustomelements.h
|
||||
+++ gstprovider/gstcustomelements/gstcustomelements.h
|
||||
@@ -21,7 +21,7 @@
|
||||
#ifndef GSTCUSTOMELEMENTS_H
|
||||
#define GSTCUSTOMELEMENTS_H
|
||||
|
||||
-#include <glib/gthread.h>
|
||||
+#include <glib.h>
|
||||
#include <gst/gst.h>
|
||||
#include <gst/base/gstpushsrc.h>
|
||||
#include <gst/video/video.h>
|
||||
diff --git a/gstprovider/gstelements/static/gstelements.h b/gstprovider/gstelements/static/gstelements.h
|
||||
index f0fbff9..b6980bd 100644
|
||||
--- gstprovider/gstelements/static/gstelements.h
|
||||
+++ gstprovider/gstelements/static/gstelements.h
|
||||
@@ -21,7 +21,7 @@
|
||||
#ifndef PSI_GSTELEMENTS_H
|
||||
#define PSI_GSTELEMENTS_H
|
||||
|
||||
-#include <glib/gmacros.h>
|
||||
+#include <glib.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
diff --git a/gstprovider/gstthread.h b/gstprovider/gstthread.h
|
||||
index aafc833..b13f380 100644
|
||||
--- gstprovider/gstthread.h
|
||||
+++ gstprovider/gstthread.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#define PSI_GSTTHREAD_H
|
||||
|
||||
#include <QThread>
|
||||
-#include <glib/gmain.h>
|
||||
+#include <glib.h>
|
||||
|
||||
namespace PsiMedia {
|
||||
|
||||
diff --git a/gstprovider/pipeline.cpp b/gstprovider/pipeline.cpp
|
||||
index 5005a66..c4281f7 100644
|
||||
--- gstprovider/pipeline.cpp
|
||||
+++ gstprovider/pipeline.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "pipeline.h"
|
||||
|
||||
+#include <stdio.h>
|
||||
#include <QList>
|
||||
#include <QSet>
|
||||
#include <gst/gst.h>
|
||||
diff --git a/gstprovider/rtpworker.cpp b/gstprovider/rtpworker.cpp
|
||||
index 35b51db..35ae41d 100644
|
||||
--- gstprovider/rtpworker.cpp
|
||||
+++ gstprovider/rtpworker.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include "rtpworker.h"
|
||||
|
||||
+#include <stdio.h>
|
||||
#include <QStringList>
|
||||
#include <QTime>
|
||||
#include "devices.h"
|
||||
diff --git a/gstprovider/rwcontrol.h b/gstprovider/rwcontrol.h
|
||||
index 307c3e3..18855c9 100644
|
||||
--- gstprovider/rwcontrol.h
|
||||
+++ gstprovider/rwcontrol.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <QMutex>
|
||||
#include <QWaitCondition>
|
||||
#include <QTimer>
|
||||
-#include <glib/gmain.h>
|
||||
+#include <glib.h>
|
||||
#include "psimediaprovider.h"
|
||||
#include "rtpworker.h"
|
||||
|
||||
@ -1,9 +1,19 @@
|
||||
--- ./psimedia.pro.orig 2009-03-05 05:01:58.000000000 +0300
|
||||
+++ ./psimedia.pro 2010-09-05 02:14:12.705470018 +0400
|
||||
@@ -1,6 +1,5 @@
|
||||
@@ -1,6 +1,13 @@
|
||||
TEMPLATE = subdirs
|
||||
|
||||
SUBDIRS += gstprovider/gstelements/static
|
||||
-SUBDIRS += gstprovider/gstelements/static
|
||||
-SUBDIRS += demo
|
||||
+sub_gstelements.subdir = gstprovider/gstelements/static
|
||||
|
||||
SUBDIRS += gstprovider
|
||||
-SUBDIRS += gstprovider
|
||||
+sub_demo.subdir = demo
|
||||
+
|
||||
+sub_gstprovider.subdir = gstprovider
|
||||
+sub_gstprovider.depends = sub_gstelements
|
||||
+
|
||||
+SUBDIRS += sub_gstelements
|
||||
+# SUBDIRS += sub_demo
|
||||
+
|
||||
+SUBDIRS += sub_gstprovider
|
||||
|
||||
Loading…
Reference in New Issue
Block a user