Fix up some dependencies.

2 files changed, 23 insertions, 16 deletions

diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index 26e8873..1dab8f3 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.Makefile
@@ -7,7 +7,7 @@
 # wpa_supplicant cairo doxygen cmake graphviz
 # suggest waiting for cairo and graphviz for later
 
-kde = extra-cmake-modules opencv-ffmpeg phonon-backend-gstreamer \
+kde = extra-cmake-modules ffmpeg phonon-backend-gstreamer \
 	  phonon-backend-vlc polkit-qt libdbusmenu-qt \
 	  plasma-wayland-protocols kf5-pre-install-config \
 	  kf5 Ark Kdenlive KMix Khelpcenter Konsole libkexiv2 \
@@ -33,6 +33,9 @@ Cdrtools : # alsa-lib
 cpio :
 	@echo $@
 
+dhcp :
+	@echo $@ "(client only)"
+
 dvd-rw-tools : Cdrtools
 	@echo $@
 
@@ -45,9 +48,6 @@ extra-cmake-modules : # CMake
 Aspell : # which
 	@echo $@
 
-Clisp : libsigsegv
-	@echo $@
-
 Exiv2 : # CMake cURL Doxygen Graphviz libxslt
 	@echo $@
 
@@ -64,6 +64,9 @@ ffmpeg : libass fdk-aac x264 x265 frei0r-plugins libcdio opencv OpenJPEG \
 	Samba XviD # FreeType2 LAME libtheora libvorbis libvpx Opus NASM \
 	yasm alsa-lib libva libvdpau SDL2 Doxygen Fontconfig FriBidi libdrm \
 	libwebp GnuTLS PulseAudio Speex v4l-utils Xorg-Libs
+	@echo $@ "(opencv4 not supported)"
+
+ffmpeg-min :
 	@echo $@
 
 frei0r-plugins : gavl # Doxygen opencv(currenty broken)
@@ -81,7 +84,7 @@ glibmm : libsigc # GLib Doxygen glib-networking GnuTLS libxslt
 GnuPG2 : Fuse ImageMagick libassuan libksba npth pinentry
 	@echo $@
 
-GPGME : Clisp GnuPG2 libassuan SWIG
+GPGME : GnuPG2 libassuan libsigsegv SWIG
 	@echo $@
 
 gptfdisk : # popt ICU
@@ -112,7 +115,7 @@ Hspell :
 Hunspell :
 	@echo $@
 
-ImageMagick : libgxps libraw OpenJPEG # -ffmpeg
+ImageMagick : libgxps libraw OpenEXR OpenJPEG # -ffmpeg
 	@echo $@
 
 jansson :
@@ -189,7 +192,7 @@ libdbusmenu-qt : # Doxygen qt-everywhere
 libdvdcss : # Doxygen
 	@echo $@
 
-libdvdnav :
+libdvdnav : libdvdread
 	@echo $@
 
 libdvdread :
@@ -259,6 +262,9 @@ media-player-info :
 mlt : frei0r-plugins libexif # qt-everywhere Doxygen fftw SDL2
 	@echo $@
 
+mobile-broadband-provider-info :
+	@echo $@
+
 ModemManager : libmbim libqmi # libgudev gobject-introspection \
 	Polkit Vala GTK-Doc
 	@echo $@
@@ -266,7 +272,8 @@ ModemManager : libmbim libqmi # libgudev gobject-introspection \
 neon : # GnuTLS libxml2 MIT_Kerberos
 	@echo $@
 
-NetworkManager : jansson libndp ModemManager newt UPower \
+NetworkManager : dhcp jansson libndp mobile-broadband-provider-info \
+	ModemManager newt UPower \
 	# cuRL gobject-introspection iptables NSS Polkit PyGObject Vala \
 	wpa_supplicant BlueZ DBus-Python GnuTLS GTK-Doc libpsl \
 	qt-everywhere Valgrind
@@ -292,9 +299,6 @@ opencv : libexif xine-lib # CMake UnZip gst-plugins-base GTK3 \
 	java Python2
 	@echo $@
 
-opencv-ffmpeg : ffmpeg
-	@echo $@
-
 OpenEXR :
 	@echo $@
 
@@ -313,7 +317,7 @@ pangomm : libcairomm glibmm # Pango
 Parse-Yapp :
 	@echo $@
 
-parted : # LVM2 dosfstools
+parted : dosfstools # LVM2 dosfstools
 	@echo $@
 
 Phonon : extra-cmake-modules # CMake GLib qt-everywhere
@@ -366,7 +370,7 @@ UPower : # libgudev libusb Polkit gobject-introspection GTK-Doc \
 	@echo $@
 
 VLC : FAAD2 libass libmpeg2 liba52 libcddb libdvdcss libdvdread \
-	libdvdnav libidn libmad Lua opencv-ffmpeg Samba x264
+	libdvdnav libidn libmad Lua ffmpeg Samba x264
 	@echo $@
 
 volume-key : GPGME SWIG # cryptsetup GLib NSS
@@ -381,7 +385,7 @@ x265 : # CMake NASM
 xapian : # Valgrind
 	@echo $@
 
-xine-lib : FAAD2 ImageMagick liba52 libdvdcss libmad Samba # -ffmpeg
+xine-lib : FAAD2 ImageMagick liba52 libdvdcss libdvdnav libmad Samba ffmpeg-min
 	@echo $@
 
 XviD : # yasm or NASM
diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index 65d68fd..e0794ec 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -7,8 +7,8 @@
 # wpa_supplicant cairo doxygen cmake graphviz
 # suggest waiting for cairo and graphviz for later
 
-qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-good-qt libtheora-qt \
-	  v4l-utils-qt wpa_supplicant-qt
+qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-base-qt \
+	  gst-plugins-good-qt v4l-utils-qt wpa_supplicant-qt
 
 
 all: $(qt5)
@@ -105,6 +105,9 @@ gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \
 	libgudev Mesa wayland-protocols Xorg-Libs
 	@echo $@
 
+gst-plugins-base-qt : qt-everywhere
+	@echo $@
+
 gst-plugins-good : AAlib alsa-oss FLAC gst-plugins-base LAME libcaca \
 	libdv libsoup libvpx mpg123 PulseAudio Speex taglib v4l-utils \
 	# Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland Valgrind \