* Fixed Debian sparc build for real (Closes: Debian bug #89285).

Makefile.in

@@ -615,8 +615,10 @@ $(PLUGIN_QT:%.o=%.moc): %.moc: %.cpp
 
 $(PLUGIN_KDE): %.o: Makefile.dep
 $(PLUGIN_KDE): %.o: .dep/%.dpp
-$(PLUGIN_KDE): %.o: %.cpp
-	$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/kde -I/usr/include/qt -fno-rtti -c -o $@ $<
+$(PLUGIN_KDE): %.o: %.moc
+	$(CC) $(CFLAGS) $(PCFLAGS) -I/usr/include/kde -I/usr/include/qt -fno-rtti -c -o $@ $(<:%.moc=%.cpp)
+$(PLUGIN_KDE:%.o=%.moc): %.moc: %.cpp
+	moc -i $< -o $@
 
 $(PLUGIN_BEOS): %.o: Makefile.dep
 $(PLUGIN_BEOS): %.o: .dep/%.dpp

debian/control

@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.1-dev, alsa-headers
+Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev [i386], libesd0-dev, libsdl1.1-dev, libasound1-dev, libqt-dev
 Standards-Version: 3.0.1
 
 Package: vlc
@@ -83,11 +83,3 @@ Description: Qt plugin for the VideoLAN Client
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin adds a Qt interface to the VideoLAN Client.
-
-Package: vlc-kde
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: KDE plugin for the VideoLAN Client
- VideoLAN is a free MPEG, MPEG2 and DVD software solution.
- .
- This plugin adds a KDE interface to the VideoLAN Client.

debian/rules

@@ -18,13 +18,14 @@ build-stamp:
 		--infodir=\$${prefix}/share/info \
 		--enable-gnome --enable-gtk --enable-fb --with-glide \
 		--with-ggi --with-sdl --enable-esd --enable-alsa \
-		--with-qt --with-kde --disable-ppro ; \
+		--enable-qt --disable-ppro ; \
 	else \
 	./configure --prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--enable-gnome --enable-gtk --enable-fb --with-ggi \
-		--with-qt --with-kde --with-sdl --enable-esd --enable-alsa; \
+		--enable-gnome --enable-gtk --enable-fb \
+		--with-ggi --with-sdl --enable-esd --enable-alsa \
+		--enable-qt ; \
 	fi
 
 	$(MAKE)
@@ -49,23 +50,17 @@ install: build
 	DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
 
 	# make symlinks for packages
-	if [ $(DEB_BUILD_ARCH) = i386 ]; then \
-		$$aliases="ggi gtk gnome glide esd sdl alsa qt kde" ; \
-	else \
-		$$aliases="ggi gtk gnome esd sdl alsa qt kde" ; \
-	fi ; \
-	for alias `echo $$aliases` ; do \
+	aliases="ggi gtk gnome esd sdl alsa qt" ; \
+	if [ $(DEB_BUILD_ARCH) = i386 ]; then aliases=$$aliases" glide" ; fi ; \
+	for alias in `echo $$aliases` ; do \
 		mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \
 		ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
 		mkdir -p debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \
 		mv debian/vlc/usr/lib/videolan/vlc/$$alias.so \
-			debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \
-	done
+			debian/vlc-$$alias/usr/lib/videolan/vlc/ ; done
 
 	mkdir -p debian/vlc-gtk/usr/bin/
 	mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
-	mkdir -p debian/vlc-kde/usr/bin/
-	mv debian/vlc/usr/bin/kvlc debian/vlc-kde/usr/bin/
 	mkdir -p debian/vlc-qt/usr/bin/
 	mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
 
@@ -76,8 +71,6 @@ install: build
 
 	mkdir -p debian/vlc-gtk/usr/share/man/man1/
 	ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
-	mkdir -p debian/vlc-kde/usr/share/man/man1/
-	ln -s vlc.1.gz debian/vlc-kde/usr/share/man/man1/kvlc.1.gz
 	mkdir -p debian/vlc-qt/usr/share/man/man1/
 	ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
 
@@ -98,10 +91,10 @@ binary-arch: build install
 #	dh_installpam
 #	dh_installinit
 	dh_installcron
-	dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt -Nvlc-kde doc/vlc.1
+	dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt doc/vlc.1
 	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt -Nvlc-kde
+	dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt
 	dh_link
 	dh_strip
 	dh_compress

src/interface/main.c

@@ -29,6 +29,7 @@
 
 #include <signal.h>                               /* SIGHUP, SIGINT, SIGKILL */
 #include <stdio.h>                                              /* sprintf() */
+#include <unistd.h>                                    /* getopt() under QNX */
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>                                              /* getopt() */