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

Fix qt5-multimedia with GStreamer 1.6.0.

Browse Source 
Qt 5 does the following during the build of qt5-multimedia:

--- qt-post-install ---
echo "# define QT_GSTREAMER"  >> /wrkdirs/usr/ports/multimedia/qt5-multimedia/
  work/stage/usr/local/include/qt5/QtCore/modules/qconfig-multimedia.h
echo "# define QT_GST_VERSION=1.0"  >> /wrkdirs/usr/ports/multimedia/
  qt5-multimedia/work/stage/usr/local/include/qt5/QtCore/modules/qconfig-multimedia.h
echo "# define QT_XVIDEO"  >> /wrkdirs/usr/ports/multimedia/qt5-multimedia/
  work/stage/usr/local/include/qt5/QtCore/modules/qconfig-multimedia.h

That's (second line) not how #define works in C of C++

The resulting qconfig-multimedia.h file contains this:

#if !defined(QT_GST_VERSION=1.0) && !defined(QT_NO_GST_VERSION=1.0)
# define QT_GST_VERSION=1.0
#endif

This patch filters out the "=1.0" from the define. Bump qt5-multimedia
since the installed header needs to be corrected.

Reported by:	antoine@
Patch submitted by:	Adriaan de Groot <groot@kde.org>
This commit is contained in:
Koop Mast 2015-09-28 20:20:53 +00:00
parent d7929eee44
commit bf4361021d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=398140
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk/bsd.qt.mk
View File

@ -635,7 +635,7 @@ qt-post-install:
@${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
@${ECHO_CMD} -n \
> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
. for def in ${QT_DEFINES:N-*:O:u}
. for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
@${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
${ECHO_CMD} "# define QT_${def}" \

1
multimedia/qt5-multimedia/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= multimedia
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMEPREFIX= qt5-