[SCM] mplayer/master: Merge tag 'upstream/1.1+dfsg1'

Fri Jan 18 22:51:48 UTC 2013

Imported Upstream version 1.1+dfsg1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 68af96cf9b2325eab0d2f61baedc69f0ca3301f3
X-Git-Newrev: 6678bc47cc184dab6a02c4e1699635a75ee7a21f

The following commit has been merged in the master branch:
commit f10e28a54e9415d4b052ba61c1f3c9b60b9df0fb
Merge: 07d6b080dc59875a7892f6a0909c1f6871a0b0b0 0d88e9ff9fd4a5c21ecf85bc7f66f1d303d1cc8d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 18 23:35:52 2013 +0100

    Merge tag 'upstream/1.1+dfsg1'
    
    Upstream version 1.1+dfsg1
    
    Conflicts:
    	.gitignore

diff --combined debian/rules
index c8cdd7b,46a9730..bbea99e

--- a/debian/rules
+++ b/debian/rules
@@@ -28,12 -28,14 +28,12 @@@ UPSTREAM_VERSION := $(shell echo $(DEB_
  SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-~]+\+svn([0-9]+)$$/\1/p')
  
  
 -#UPSTREAMSOURCE := upstream SVN repository
 -UPSTREAMSOURCE := http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2
 -
  DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
  DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
  DEB_HOST_ARCH_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 +DEB_VENDOR          ?= $(shell dpkg-vendor --query Vendor)
  
  
  # XXX enable-menu is frowned upon by upstream
@@@ -42,12 -44,9 +42,13 @@@ CONFIGURE_FLAGS = 
  	--confdir=/etc/mplayer \
  	--enable-xvmc \
  	--enable-menu \
+ 	--enable-radio --enable-radio-capture \
  	--disable-arts \
  	--language=all \
 +	--disable-dvdread-internal \
 +	--disable-libdvdcss-internal \
 +	--disable-libmpeg2-internal \
 +	--disable-ffmpeg_a \
  	$(archconf)
  
  ifeq ($(DEB_HOST_ARCH),i386)
@@@ -68,13 -67,6 +69,13 @@@ endi
  ifeq ($(DEB_HOST_ARCH),powerpc)
    CONFIGURE_FLAGS += --enable-runtime-cpudetection
  endif
 +# when run on a sparc64 kernel, configure will normally select v9 asm.
 +# this is hidden when running on buildds with 32bit kernel personality.
 +# because of #644856, this will currently lead to a FTBFS
 +# therefore, we force a 'generic' target.
 +ifeq ($(DEB_HOST_ARCH),sparc)
 +  archconf += --target=generic
 +endif
  ifeq ($(DEB_HOST_ARCH),alpha)
  #Avoid high optimization through gcc.
  # see http://permalink.gmane.org/gmane.linux.debian.ports.alpha/7295
@@@ -88,10 -80,11 +89,10 @@@ CONFIGURE_FLAGS += --enable-debu
  endif
  
  ifeq (linux,$(DEB_HOST_ARCH_OS))
 -    CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb
 -endif
 -
 -ifneq (,$(DEB_EXTRA_CONFIGURE_FLAGS))
 -    CONFIGURE_FLAGS += $(DEB_EXTRA_CONFIGURE_FLAGS)
 +    CONFIGURE_FLAGS += --enable-joystick
 +    sound_backend := alsa
 +else
 +    sound_backend := oss
  endif
  
  build: build-arch build-indep
@@@ -100,7 -93,6 +101,7 @@@
  build-arch:
  	dh_testdir
  	dh_prep -a
 +	echo "svn r$(SVN_VERSION) ($(DEB_VENDOR)), built with gcc" > VERSION
  	$(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
@@@ -119,8 -111,6 +120,8 @@@ debian/mplayer/usr/bin/mplayer debian/m
  	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
  	install -D -m 644 debian/mplayer.conf \
  	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
 +	sed -e "s/@SOUND_BACKEND@/$(sound_backend)/" -i \
 +	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
  
  # build gui version
  debian/mplayer-gui/usr/bin/gmplayer:
@@@ -128,12 -118,22 +129,22 @@@
  	$(CLEAN_ENV) \
  	./configure $(CONFIGURE_FLAGS) --enable-gui
  	$(CLEAN_ENV) \
 -	$(MAKE) $(NUMJOBS) mplayer V=1
 +	$(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
+ 	install -D -m 644 etc/mplayer16x16.png \
+ 	                  $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/16x16/apps/mplayer.png
+ 	install -D -m 644 etc/mplayer22x22.png \
+ 	                  $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/22x22/apps/mplayer.png
+ 	install -D -m 644 etc/mplayer24x24.png \
+ 	                  $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/24x24/apps/mplayer.png
+ 	install -D -m 644 etc/mplayer32x32.png \
+ 	                  $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/32x32/apps/mplayer.png
+ 	install -D -m 644 etc/mplayer48x48.png \
+ 	                  $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/48x48/apps/mplayer.png
+ 	install -D -m 644 etc/mplayer256x256.png \
+ 	                  $(CURDIR)/debian/mplayer-gui/usr/share/icons/hicolor/256x256/apps/mplayer.png
  
  
  # binaries already installed via build rules as we have to build several flavors
@@@ -160,7 -160,6 +171,7 @@@ install-indep: build-inde
  clean:
  	dh_testdir
  	dh_testroot
 +	dh_clean VERSION
  	-test -f config.mak && $(MAKE) distclean
  
  # Build architecture-independent packages
@@@ -190,7 -189,7 +201,7 @@@ binary-arch: install-arc
  
  binary: binary-indep binary-arch
  
 -PHONY += build clean binary-indep binary-arch binary-common binary
 +PHONY += build clean binary-indep binary-arch binary-common binary 
  PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source
  PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig
  

-- 
mplayer packaging

