On Sun Mar 03, 2019 at 12:31:11PM +0000, Stuart Henderson wrote:
> On 2019/03/03 13:20, Rafael Sadowski wrote:
> > On Fri Mar 01, 2019 at 08:48:54PM +0000, Stuart Henderson wrote:
> > > On 2019/03/01 12:53, Rafael Sadowski wrote:
> > > > On Fri Mar 01, 2019 at 08:27:43AM +0000, Stuart Henderson wrote:
> > > > > On 2019/03/01 06:56, Rafael Sadowski wrote:
> > > > > > libxml is not in WANTLIB (also after update) but there is a CMake
> > > > > > check
> > > > > > at configure-time. Added NO_TEST=Yes, while here.
> > > > >
> > > > > What's the story with libxml here? It has a cmake check but doesn't
> > > > > seem
> > > > > to be used?
> > > >
> > > > Exactly! There is a check in the main ./CMakeLists.txt and only one
> > > > include (include_directories) in ./gstreamer/CMakeLists.txt.
> > > >
> > > > "LibXml2 is required to compile the gstreamer backend for Phonon"
> > > > ^^^^^^^
> > >
> > > Yes I see the check - but I don't see where it is used.
> > >
> >
> > gstreamer/CMakeLists.txt line 23 "${LIBXML2_INCLUDE_DIR}" Anyway I can't
> > build phonon-qt5-gstreamer-4.9.0-qt5 without libxml2 on my system
> > because it's comes from qt5-base.
> >
> > RS
> >
>
> Again: I don't see where it is used. None of the files in
> include/libxml2/libxml are pulled in by phonon-backend-gstreamer build
> (you can test this easily, move the directory out the way after make
> configure).
> So it seems like it is a useless check in CMakeLists.txt.
>
> I don't object to the BUILD_DEPENDS but if it's really a useless check
> then it would be nicer if the check (and dependency) wasn't there, it would
> be one less thing to check if someone updates libxml.
>
Ok, LibXml2 is not needed to compile the gstreamer backend for Phonon.
Tested with the diff below and renamed /usr/local/libxml. Of course
tested with qt5 and !qt5.
I'll submit it upstream.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 19 Oct 2018 20:53:27 -0000 1.22
+++ Makefile 3 Mar 2019 16:33:58 -0000
@@ -12,6 +12,7 @@ MASTER_SITES = https://download.kde.org
FULLPKGNAME-main = ${PKGNAME}
FULLPKGPATH-main = ${PKGPATH},${FLAVOR},-main
+REVISION-main = 0
# deconflict Qt4 and Qt5 versions by extracting common data
MULTI_PACKAGES = -main -icons
@@ -27,7 +28,6 @@ RUN_DEPENDS-main = multimedia/gstreamer1
LIB_DEPENDS-icons =
LIB_DEPENDS-main = ${LIB_DEPENDS} \
- textproc/libxml \
multimedia/gstreamer1/core \
multimedia/gstreamer1/plugins-base
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 3 Mar 2019 16:33:58 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+LibXml2 is not needed to compile the gstreamer backend for Phonon
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -50,9 +50,6 @@ macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is requi
+
+ find_package(GObject REQUIRED)
+
+-find_package(LibXml2 REQUIRED)
+-macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the
gstreamer backend for Phonon" "http://xmlsoft.org/downloads.html"; TRUE)
+-
+ add_subdirectory(gstreamer)
+
+ macro_display_feature_log()
Index: patches/patch-gstreamer_CMakeLists_txt
===================================================================
RCS file: patches/patch-gstreamer_CMakeLists_txt
diff -N patches/patch-gstreamer_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-gstreamer_CMakeLists_txt 3 Mar 2019 16:33:58 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+LibXml2 is not needed to compile the gstreamer backend for Phonon
+
+Index: gstreamer/CMakeLists.txt
+--- gstreamer/CMakeLists.txt.orig
++++ gstreamer/CMakeLists.txt
+@@ -20,7 +20,6 @@ include_directories(
+ ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR}
+ ${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR}
+ ${GLIB2_INCLUDE_DIR}
+- ${LIBXML2_INCLUDE_DIR}
+ ${X11_X11_INCLUDE_PATH})
+
+ if(${PHONON_VERSION} VERSION_GREATER "4.6.49") # Pre-release 4.7 starts at
4.6.50
