[SCM] mplayer/master.experimental: Revert "no longer build mplayer-gui, it doesn't build anymore with shared swscale"

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 490fed91420bbdd78c4e447c00ac656559ca05b1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 4 19:39:01 2012 +0100

    Revert "no longer build mplayer-gui, it doesn't build anymore with shared swscale"
    
    This reverts commit 490c1dbad5c83574eb0b2afcd42be00a5ca664d1.
    
    Conflicts:
    
    	debian/control
    	debian/rules

diff --git a/debian/control b/debian/control
index 8baea5b..190110f 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Build-Depends:
  libfribidi-dev,
  libgif-dev,
  libgl1-mesa-dev,
+ libgtk2.0-dev,
  libjack-dev,
  libjpeg-dev,
  liblircclient-dev,
@@ -75,6 +76,38 @@ Build-Depends:
  yasm,
  zlib1g-dev
 
+Package: mplayer-gui
+Architecture: any
+Suggests:
+ bzip2,
+ fontconfig,
+ mplayer-doc,
+ ttf-freefont
+Depends:
+ mplayer,
+ mplayer-skin,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ mplayer (<< 2:1.0~rc3+svn20090426-2),
+ mplayer-doc (<< 2:1.0~rc3+svn20090426-2)
+Description: movie player for Unix-like systems
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ Another big feature of MPlayer is the wide range of supported output
+ drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
+ DirectFB, but also SDL (plus all its drivers) and some
+ low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
+ and Permedia3). Most of them support software or hardware scaling,
+ therefore allowing fullscreen display.  MPlayer is also able
+ to use some hardware MPEG decoder boards, such as the DVB
+ and DXR3/Hollywood+.
+ .
+ This package includes the gui variant of mplayer.
+
 Package: mencoder
 Architecture: any
 Suggests:
diff --git a/debian/rules b/debian/rules
index c8d79f9..d6b9d28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,6 +107,7 @@ build-arch:
 	dh_prep -a
 	$(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer
 	$(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
+	$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
 
 # build non-gui version
 # & mencoder
@@ -125,6 +126,19 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	sed -e "s/@SOUND_BACKEND@/$(sound_backend)/" -i \
 	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
 
+# build gui version
+debian/mplayer-gui/usr/bin/gmplayer:
+	dh_testdir
+	$(CLEAN_ENV) \
+	./configure $(CONFIGURE_FLAGS) --enable-gui
+	$(CLEAN_ENV) \
+	$(MAKE) $(NUMJOBS) mplayer
+	install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
+	install -D -m 644 etc/mplayer.desktop \
+	                  $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop
+	install -D -m 644 etc/mplayer.png \
+	                  $(CURDIR)/debian/mplayer-gui/usr/share/pixmaps/mplayer.png
+
 
 # binaries already installed via build rules as we have to build several flavors
 install-arch: build-arch

-- 
mplayer packaging