linphone: clean up

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: linphone: clean up
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Wed, 15 Apr 2020 08:15:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Apr 15 10:15:55 2020 +0200
Changeset:	c356f439f74ff8f6124f70e4eedb90270383a61a

Modified Files:
	linphone/Makefile
	linphone/distinfo
	linphone/options.mk
Added Files:
	linphone/patches/patch-configure
Removed Files:
	linphone/patches/patch-ac
	linphone/patches/patch-ae

Log Message:
linphone: clean up

Update configure arguments a bit.
Remove empty patches.
Needs belle-sip instead of osip, but that doesn't build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c356f439f74ff8f6124f70e4eedb90270383a61a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 linphone/Makefile                | 12 +++---------
 linphone/distinfo                |  4 +---
 linphone/options.mk              | 13 ++++---------
 linphone/patches/patch-ac        |  2 --
 linphone/patches/patch-ae        |  2 --
 linphone/patches/patch-configure | 31 +++++++++++++++++++++++++++++++
 6 files changed, 39 insertions(+), 25 deletions(-)

diffs:
diff --git a/linphone/Makefile b/linphone/Makefile
index 001618e8e8..4ee5e46fcd 100644
--- a/linphone/Makefile
+++ b/linphone/Makefile
@@ -15,11 +15,6 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ARGS+=	--with-osip=${BUILDLINK_PREFIX.libosip2}
-CONFIGURE_ARGS+=	--with-speex=${BUILDLINK_PREFIX.speex}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/linphone
-CONFIGURE_ARGS+=	--disable-manual --enable-glib
-
 # don't treat warnings as errors, code is not portable enough (3.4.2)
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
@@ -31,13 +26,13 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 CONFIGURE_ARGS+=	--enable-macsnd
 .  if !empty(PKGSRC_COMPILER:Mgcc*)
 SUBST_CLASSES+=			objective-c
-SUBST_STAGE.objective-c=	post-patch
+SUBST_STAGE.objective-c=	pre-configure
 SUBST_MESSAGE.objective-c=	adding "-x objective-c" for mediastreamer2 code
 SUBST_FILES.objective-c=	mediastreamer2/src/Makefile.in
 SUBST_SED.objective-c=		-e 's/^CC = @CC@/CC = @CC@ -x objective-c/g'
 .  endif
 SUBST_CLASSES+=			frameworks
-SUBST_STAGE.frameworks=		post-patch
+SUBST_STAGE.frameworks=		pre-configure
 SUBST_MESSAGE.frameworks=	adding Carbon and AudioUnit frameworks
 SUBST_FILES.frameworks=		mediastreamer2/configure
 SUBST_SED.frameworks=		-e 's/-framework CoreFoundation -framework AudioToolbox -framework CoreAudio/-framework Carbon -framework AudioToolbox -framework AudioUnit/g'
@@ -51,9 +46,8 @@ CPPFLAGS+=	-DDSP_NAME="\"${DEVOSSAUDIO}\""
 .include "../../audio/speex/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libosip/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../wip/belle-sip/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../net/libexosip/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/linphone/distinfo b/linphone/distinfo
index 164e066949..b9451627fe 100644
--- a/linphone/distinfo
+++ b/linphone/distinfo
@@ -6,6 +6,4 @@ SHA512 (linphone-3.9.1.tar.gz) = 1824ef0012995985788b2a14dc886c82a05a6ad547d60be
 Size (linphone-3.9.1.tar.gz) = 13443595 bytes
 SHA1 (patch-aa) = d27f9fe2c7f86fbf30e9a8a76b8c2c23f001b331
 SHA1 (patch-ab) = fd1174da58b5610b6c92cae784f4623aaa03c71c
-SHA1 (patch-ac) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
-SHA1 (patch-ae) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
-SHA1 (patch-configure) = b7513bb52da1e7ee7c2f9d70d4b377b3e162c776
+SHA1 (patch-configure) = 47bdab8b59e2b0329963d552c45750cc8a46c9cb
diff --git a/linphone/options.mk b/linphone/options.mk
index 7b87a03e6b..d2ce70c19a 100644
--- a/linphone/options.mk
+++ b/linphone/options.mk
@@ -10,15 +10,14 @@ PKG_SUGGESTED_OPTIONS=	inet6 linphone-gui linphone-video gsm
 CONFIGURE_ARGS+=	--enable-alsa
 .endif
 
-.if empty(PKG_OPTIONS:Mlinphone-gui)
-CONFIGURE_ARGS+=	--enable-gnome_ui=no
+.if !empty(PKG_OPTIONS:Mlinphone-gui)
+PLIST_SUBST+=	GUI=
+CONFIGURE_ARGS+=	--enable-gtk_ui=yes
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 PLIST_SUBST+=	GUI="@comment "
 .else
-PLIST_SUBST+=	GUI=
-CONFIGURE_ARGS+=	--enable-gnome_ui=yes
-.include "../../x11/gnome-panel/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gtk_ui=no
 .endif
 
 .if empty(PKG_OPTIONS:Mlinphone-gui) || empty(PKG_OPTIONS:Mlinphone-video)
@@ -31,10 +30,6 @@ CONFIGURE_ARGS+=	--enable-video=yes
 
 .if !empty(PKG_OPTIONS:Mgsm)
 .include "../../audio/gsm/buildlink3.mk"
-SUBST_CLASSES+=		gsm
-SUBST_STAGE.gsm=	post-patch
-SUBST_FILES.gsm=	mediastreamer2/src/gsm.c mediastreamer2/configure
-SUBST_SED.gsm=		-e 's,gsm/gsm.h,gsm.h,g'
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
diff --git a/linphone/patches/patch-ac b/linphone/patches/patch-ac
deleted file mode 100644
index 7c6c053b44..0000000000
--- a/linphone/patches/patch-ac
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2012/04/13 20:02:17 gschwarz Exp $
-
diff --git a/linphone/patches/patch-ae b/linphone/patches/patch-ae
deleted file mode 100644
index 1934cb0ced..0000000000
--- a/linphone/patches/patch-ae
+++ /dev/null
@@ -1,2 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2012/04/13 20:02:17 gschwarz Exp $
-
diff --git a/linphone/patches/patch-configure b/linphone/patches/patch-configure
new file mode 100644
index 0000000000..291be85fc0
--- /dev/null
+++ b/linphone/patches/patch-configure
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- configure.orig	2015-11-16 12:44:15.066306748 +0000
++++ configure
+@@ -17316,7 +17316,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Enable library dependencies linking: $enable_interlib_deps" >&5
+ $as_echo "$as_me: Enable library dependencies linking: $enable_interlib_deps" >&6;}
+-if test "${enable_deplibs_linking}" == "yes"; then
++if test "${enable_deplibs_linking}" = "yes"; then
+ 	link_all_deplibs=yes
+ 	link_all_deplibs_CXX=yes
+ else
+@@ -19609,7 +19609,7 @@ fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBUPNP_PKG_ERRORS" >&5
+ 
+-	if test "$build_upnp" == "true" ; then
++	if test "$build_upnp" = "true" ; then
+ 			as_fn_error $? "libupnp not found." "$LINENO" 5
+ 		else
+ 			build_upnp=false
+@@ -19618,7 +19618,7 @@ fi
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-	if test "$build_upnp" == "true" ; then
++	if test "$build_upnp" = "true" ; then
+ 			as_fn_error $? "libupnp not found." "$LINENO" 5
+ 		else
+ 			build_upnp=false
Prev by Date: belle-sip: make this get past the configure step
Next by Date: allegro52: remove, newer version in devel/allegro5
Previous by Thread: belle-sip: make this get past the configure step
Next by Thread: allegro52: remove, newer version in devel/allegro5
Indexes:
Home | Main Index | Thread Index | Old Index