cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure Qt5 is not picked up. Dunno why it didn't trigger with Qt 5.5.

Browse Source 
I didn't find a better way to disable it rather than hacking configure.ac
internally; if you know one, be my guest.

Found by naddy@
This commit is contained in:
zhuk 2016-12-28 13:13:55 +00:00
parent ac97b164f2
commit 5255000f5e
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/gstreamer1/plugins-base/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.48 2016/11/30 11:08:02 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.49 2016/12/28 13:13:55 zhuk Exp $
COMMENT= base elements for GStreamer
DISTNAME= gst-plugins-base-${V}
PKGNAME= ${GST_PKGNAME_PREFIX}-plugins-base-${V}
REVISION= 0
SHARED_LIBS += gsttag-1.0 3.1 # 1002.0
SHARED_LIBS += gstaudio-1.0 3.1 # 1002.0

27
multimedia/gstreamer1/plugins-base/patches/patch-configure_ac
View File

@ -1,10 +1,21 @@
$OpenBSD: patch-configure_ac,v 1.12 2016/11/02 22:19:21 ajacoutot Exp $
$OpenBSD: patch-configure_ac,v 1.13 2016/12/28 13:13:55 zhuk Exp $
XXX old cdparanoia-3.a9.8 (cdparanoia-III-9.8) does not have cache control.
1. Old cdparanoia-3.a9.8 (cdparanoia-III-9.8) does not have cache control.
--- configure.ac.orig Tue Nov 1 16:11:31 2016
+++ configure.ac Wed Nov 2 16:02:38 2016
@@ -629,6 +629,21 @@ AG_GST_CHECK_FEATURE(ALSA, [ALSA], alsa, [
2. Avoid picking up Qt5 (used for examples only), or this will create
a circular dependency.
--- configure.ac.orig Tue Nov 29 15:22:19 2016
+++ configure.ac Wed Dec 28 15:50:30 2016
@@ -319,6 +319,7 @@ PKG_CHECK_MODULES(QT, Qt5Gui Qt5Widgets, [
], [
HAVE_QT=no
])
+HAVE_QT=no
if test "x$HAVE_QT" = "xyes"; then
AC_CHECK_TOOL(QT_MOC, moc)
AC_MSG_CHECKING([for Qt5 moc])
@@ -629,6 +630,21 @@ AG_GST_CHECK_FEATURE(ALSA, [ALSA], alsa, [
])
])
@ -26,7 +37,7 @@ XXX old cdparanoia-3.a9.8 (cdparanoia-III-9.8) does not have cache control.
dnl *** CDParanoia ***
dnl Note: upstream has a pkg-config file only in post-10.2 SVN so far
translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true)
@@ -659,10 +674,10 @@ AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparan
@@ -659,10 +675,10 @@ AG_GST_CHECK_FEATURE(CDPARANOIA, [CDParanoia], cdparan
if test "x$FOUND_CDPARANOIA" = "xyes";
then
AC_CHECK_LIB(cdda_paranoia,
@ -39,7 +50,7 @@ XXX old cdparanoia-3.a9.8 (cdparanoia-III-9.8) does not have cache control.
fi
AC_SUBST(CDPARANOIA_LIBS)
@@ -773,6 +788,7 @@ else
@@ -773,6 +789,7 @@ else
dnl not building plugins with external dependencies,
dnl but we still need to set the conditionals
AM_CONDITIONAL(USE_ALSA, false)
@ -47,7 +58,7 @@ XXX old cdparanoia-3.a9.8 (cdparanoia-III-9.8) does not have cache control.
AM_CONDITIONAL(USE_CDPARANOIA, false)
AM_CONDITIONAL(USE_IVORBIS, false)
AM_CONDITIONAL(USE_LIBVISUAL, false)
@@ -893,6 +909,7 @@ sys/ximage/Makefile
@@ -893,6 +910,7 @@ sys/ximage/Makefile
sys/xvimage/Makefile
ext/Makefile
ext/alsa/Makefile