SF.net SVN: gar:[22673] csw/mgar/pkg/mplayer/trunk
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Wed Dec 11 12:18:03 CET 2013
Revision: 22673
http://gar.svn.sourceforge.net/gar/?rev=22673&view=rev
Author: pfelecan
Date: 2013-12-11 11:18:03 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
mplayer/trunk: instantiate again the release/stable version
Modified Paths:
--------------
csw/mgar/pkg/mplayer/trunk/Makefile
csw/mgar/pkg/mplayer/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch
csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch
csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch
csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch
csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch
csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch
csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch
csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch
Modified: csw/mgar/pkg/mplayer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-10 19:05:07 UTC (rev 22672)
+++ csw/mgar/pkg/mplayer/trunk/Makefile 2013-12-11 11:18:03 UTC (rev 22673)
@@ -1,349 +1,281 @@
-# $Id$
-#
-##Mplayer and $ISAEXEC makefile example###
-#
-# This makefile has a lot of notes and extra information in it, as I've been
-# using it as documentation while working away at this project. It will be
-# tidied up before I submit it for official review.
+# $Id: Makefile 22672 2013-12-10 19:05:07Z pfelecan $
-NAME = MPlayer
-VERSION = 1.0rc2
-VERSION_Blue = 1.7
-GARTYPE = v2
+NAME = mplayer
+ALIAS = MPlayer
+VERSION = 1.1.1
+GARTYPE = v2
-DESCRIPTION = MPlayer is a movie player which runs on many systems
+DESCRIPTION = Stable Release of The Movie Player and Encoder
define BLURB
+ MPlayer can play most standard video formats out of the box and
+ almost all others with the help of external codecs. MPlayer
+ currently works best from the command line, but visual feedback
+ for many functions is available from its onscreen status display
+ (OSD), which is also used for displaying subtitles. MPlayer also
+ has a GUI with skin support and several unofficial alternative
+ graphical frontends are available.
- MPlayer is a movie player which runs on many systems (see the documentation).
- It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,
- RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files,
- supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
- SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies..
-
+ MEncoder is a command line video encoder for advanced users that
+ can be built from the MPlayer source tree. Unofficial graphical
+ frontends exist but are not included.
endef
-MASTER_SITES = http://www3.mplayerhq.hu/MPlayer/releases/ http://www3.mplayerhq.hu/MPlayer/skins/
+VENDOR_URL = http://www.mplayerhq.hu/MPlayer/
+MASTER_SITES = http://www.mplayerhq.hu/MPlayer/releases/
+DISTFILES = $(ALIAS)-$(VERSION).tar.xz
+DISTNAME = $(ALIAS)-$(VERSION)
+PATCHFILES += 0001-configure-uses-bash.patch
+PATCHFILES += 0002-version-uses-bash.patch
+PATCHFILES += 0003-use-csw-catalog-for-documentation.patch
+PATCHFILES += 0004-test-sse-support.patch
+PATCHFILES += 0005-enhance-X-Windows-detection.patch
+PATCHFILES += 0006-fix-memalign-detection.patch
+PATCHFILES += 0007-fix-memalign-prototype.patch
+PATCHFILES += 0008-ffmpeg-script-uses-bash.patch
-GARCOMPILER = GCC4
-GNU_CC_HOME = /opt/csw/gcc4
+PACKAGING_PLATFORMS = solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += Blue-$(VERSION_Blue).tar.bz2
+BUILD_DEP_PKGS += CSWdocbookdtds
+BUILD_DEP_PKGS += CSWdocbookxsl
+BUILD_DEP_PKGS += CSWfaac
+BUILD_DEP_PKGS += CSWfontconfig-dev
+BUILD_DEP_PKGS += CSWgroff
+BUILD_DEP_PKGS += CSWliba52
+BUILD_DEP_PKGS += CSWlibaa-dev
+BUILD_DEP_PKGS += CSWlibaudiofile-dev
+BUILD_DEP_PKGS += CSWlibdvdcss-dev
+BUILD_DEP_PKGS += CSWlibdvdnav-dev
+BUILD_DEP_PKGS += CSWlibdvdread-dev
+BUILD_DEP_PKGS += CSWlibfaad-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWlibfribidi-dev
+BUILD_DEP_PKGS += CSWlibgif-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWlibjpeg-dev
+BUILD_DEP_PKGS += CSWliblz-dev
+BUILD_DEP_PKGS += CSWliblzo-dev
+BUILD_DEP_PKGS += CSWlibmad-dev
+BUILD_DEP_PKGS += CSWlibmp3lame-dev
+BUILD_DEP_PKGS += CSWlibncurses-dev
+BUILD_DEP_PKGS += CSWlibogg-dev
+BUILD_DEP_PKGS += CSWliboggz-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWlibrtmp-dev
+BUILD_DEP_PKGS += CSWlibsdl-dev
+BUILD_DEP_PKGS += CSWlibspeex-dev
+BUILD_DEP_PKGS += CSWlibtheora-dev
+BUILD_DEP_PKGS += CSWlibx264-dev
+BUILD_DEP_PKGS += CSWlibxvidcore-dev
+BUILD_DEP_PKGS += CSWmesa
+BUILD_DEP_PKGS += CSWmpg123
+BUILD_DEP_PKGS += CSWnas
+BUILD_DEP_PKGS += CSWunrar
+BUILD_DEP_PKGS += CSWlibxmms-dev
+BUILD_DEP_PKGS += CSWyasm
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-LICENSE = LICENSE
+GARCOMPILER = GNU
-PACKAGES = CSWmplayer
-CATALOGNAME_CSWmplayer = mplayer
+# 2 packages: mplayer, mencoder; separate recipe for codec, fonts and
+# skin
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS = custom
-RUNTIME_DEP_PKGS_CSWmplayer += CSWaalib
-RUNTIME_DEP_PKGS_CSWmplayer += CSWesound
-RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac
-RUNTIME_DEP_PKGS_CSWmplayer += CSWfconfig
-RUNTIME_DEP_PKGS_CSWmplayer += CSWftype2
-RUNTIME_DEP_PKGS_CSWmplayer += CSWgiflibrt
-RUNTIME_DEP_PKGS_CSWmplayer += CSWglib
-RUNTIME_DEP_PKGS_CSWmplayer += CSWgtk
-RUNTIME_DEP_PKGS_CSWmplayer += CSWiconv
-RUNTIME_DEP_PKGS_CSWmplayer += CSWjpeg
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlame
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx11
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxext
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxt
-RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa
-RUNTIME_DEP_PKGS_CSWmplayer += CSWnas
-RUNTIME_DEP_PKGS_CSWmplayer += CSWncurses
-RUNTIME_DEP_PKGS_CSWmplayer += CSWopenal
-RUNTIME_DEP_PKGS_CSWmplayer += CSWpng
-RUNTIME_DEP_PKGS_CSWmplayer += CSWspeex
-RUNTIME_DEP_PKGS_CSWmplayer += CSWtheora
-RUNTIME_DEP_PKGS_CSWmplayer += CSWzlib
+PACKAGES = CSWmplayer
+CATALOGNAME_CSWmplayer = mplayer
+SPKG_DESC_CSWmplayer = $(DESCRIPTION), the player
+RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac
+RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibesd0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfaad2
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWmplayer += CSWliblzo2-2
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmad0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibmp3lame0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibrtmp0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibx264-133
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibxvidcore4
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibz1
+RUNTIME_DEP_PKGS_CSWmplayer += CSWmesa
+RUNTIME_DEP_PKGS_CSWmplayer += CSWmpg123
+RUNTIME_DEP_PKGS_CSWmplayer += CSWnas
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWmplayer)
-BUILD_DEP_PKGS += CSWgnulinks
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libX11.so.4
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXext.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXinerama.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liba52.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaa.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libaudio.so.2
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libesd.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaac.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfaad.so.2
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfontconfig.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfreetype.so.6
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libfribidi.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libiconv.so.2
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libkstat.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|liblzo2.so.2
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmad.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmp3lame.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libmpg123.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libogg.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|librtmp.so.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libspeex.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libtheoradec.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libx264.so.133
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so.1
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libbz2.so.1.0
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libjpeg.so.7
+CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libpng15.so.15
-PATCHFILES = fix-configure.diff
-PATCHFILES += fix-libavcodec-gcc-bug.diff
-PATCHFILES += fix-manpage-macros.diff
-PATCHFILES += sparc-v8-novis.diff
-#Sol8 only PATCHFILES += stdint-wrapper.diff
+# only on BO build farm; on my build farm it's included and detected TODO
+CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWlibaudiofile0
-UNWANTED_CONF_ARGS = --sysconfdir=/opt/csw/etc --sbindir=/opt/csw/sbin --exec_prefix=/opt/csw --libexecdir=/opt/csw/libexec
-UNWANTED_CONF_ARGS += --sharedstatedir=/opt/csw/share
-UNWANTED_CONF_ARGS += --localstatedir=/opt/csw/var
-UNWANTED_CONF_ARGS += --infodir=/opt/csw/share/info
-UNWANTED_CONF_ARGS += --includedir=/opt/csw/include
-UNWANTED_CONF_ARGS += --sbindir=/opt/csw/sbin/amd64
-UNWANTED_CONF_ARGS += --libexecdir=/opt/csw/libexec/amd64
+# this cannot be computed:
+RUNTIME_DEP_PKGS_CSWmplayer += CSWunrar
+CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWunrar
-CONFIGURE_ARGS = $(filter-out $(UNWANTED_CONF_ARGS),$(DIRPATHS))
-CONFIGURE_ARGS += --with-extraincdir=/opt/csw/X11/include
-CONFIGURE_ARGS += --mandir=$(BUILD_PREFIX)/share/man
-CONFIGURE_ARGS += --enable-gui
-CONFIGURE_ARGS += --disable-win32dll
-CONFIGURE_ARGS += --disable-libvorbis #Having trouble compiling it
+# this exists only on i386 and Solaris 10
+CHECKPKG_OVERRIDES_CSWmplayer += missing-dependency|NVDAgraphics
+# this in incongruous (due to man/cat1 usage):
+CHECKPKG_OVERRIDES_CSWmencoder += missing-dependency|CSWfltk
-NO_MMX_ARGS += --disable-sse
-NO_MMX_ARGS += --disable-sse2
-NO_MMX_ARGS += --disable-ssse3
-NO_MMX_ARGS += --disable-mmx
-NO_MMX_ARGS += --disable-mmxext
-CONFIGURE_ARGS_isa-i386 += $(NO_MMX_ARGS)
-CONFIGURE_ARGS_isa-amd64 += $(NO_MMX_ARGS)
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
-#CONFIGURE_ARGS += --disable-libcdio
-#CONFIGURE_ARGS += --disable-iconv #Solaris libc has iconv already
+PACKAGES += CSWmencoder
+CATALOGNAME_CSWmencoder = mencoder
+SPKG_DESC_CSWmencoder = $(DESCRIPTION), the encoder
+PKGFILES_CSWmencoder += /opt/csw/bin/mencoder
+PKGFILES_CSWmencoder += /opt/csw/share/man/man1/mencoder.1
+PKGFILES_CSWmencoder += /opt/csw/share/man/cat1/mencoder.1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWmplayer
+CHECKPKG_OVERRIDES_CSWmencoder += surplus-dependency|CSWmplayer
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibxvidcore4
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmp3lame0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfaad2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibx264-133
+RUNTIME_DEP_PKGS_CSWmencoder += CSWliba52
+RUNTIME_DEP_PKGS_CSWmencoder += CSWfaac
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibrtmp0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWliblzo2-2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibz1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmad0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWmpg123
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.7
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng15.so.15
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1
-# Mplayer sparc-specific patches
-# Openal for sparc is broken
-# OpenGL isn't working on osiris
-ifeq ($(shell uname -p),sparc)
-CONFIGURE_ARGS += --disable-openal
-CONFIGURE_ARGS += --disable-gl
-endif
+PACKAGES += CSWmplayer-doc
+CATALOGNAME_CSWmplayer-doc = $(NAME)_doc
+SPKG_DESC_CSWmplayer-doc = $(DESCRIPTION), the documentation
+PKGFILES_CSWmplayer-doc += $(docdir)/$(NAME)_doc/.*
+ARCHALL_CSWmplayer-doc = 1
-# Fails in amd64
-# BUILD64 = 1
-
-TEST_SCRIPTS =
-
-###Framework for an $ISAEXEC optimised build###
-# To allow for the same build to run multiple times without each version
-# clobbering the non-unique work/cookie folders each time, we append the
-# target $ISA to each foldername.
-#
-# 1) gmake optbuild: runs the standard gar framework through the optbuild for
-# loop. This loop allows for each of the targets in $ISATARGET to be built
-# using the appropriate compiler flags for optimisation.
-# The optbuild target takes us to the end of the install step.
-# When all the building is done, we're going to only want the one package,
-# (not N versions). All the resultant binaries from each $ISATARGET are
-# merged into the $BASEISA $DESTDIR by the merge-opt-bins target.
-# It's this $BASEISA that will be used for the final resultant ISAEXEC pkg
-#
-# Gar currently merges and overlaps the install & package targets.
-# We want the install phase to be run in a for loop, but the package
-# phase to run only once (on our $BASEISA), so I've had to explictly
-# split the phases.
-#
-# 2) gmake only-package: Runs the standard packing steps on the $BASEISA
-# install dir ($DESTDIR), however I've run into a problem with the
-# mkpackage perl script's handling of the prototype file; we need it to
-# merge both our standard directory structure, and also the added isaexec
-# hardlinks.
-# The isa-post-package step adds the appropriate lines to the prototype
-# however mkpackage will then either 1) overwrite it anyway, or
-# 2) in merge mode, it will take our 2 isaexec lines, and only append
-# those 2 lines (ignoring all the standard files in our package).
-#
-# My sneaky workaround for this is to add the extra lines in the
-# isa-post-package target, followed by re-running the package-create step.
-# The package-create target the prototype already contains a full
-# file/dir layout and our isaexec hardlink(s), so mkpackage simply
-# merges(appends) the key isaexec links.
-# In fact, the admfiles are actually already there (from the first trip
-# through package-create), but mkpackage is smart enough to remove the
-# duplicate lines! :)
-
-### Makefile target order ###
-# 1) "gmake optbuild" runs the following gar steps on each of the $ISALIST
-# build (and all of it's dependanies - extract/patch/etc etc)
-# pre-install (calls timestamp, skins, fonts, and merge-opt-bins)
-# ===> timestamp (creates timestamp to track the new files for packaging)
-# ===> skins (copies the Mplayer skins into the install dirs)
-# ===> fonts (creates a symlink for the Mplayer OSD font)
-# ===> merge-opt-bins (Moves the optimised $ISAEXEC_BINS from $ISALIST
-# into the appropriate $ISAEXEC_DIR within the $BASEISA)
-# install (standard install target)
-# post-install (calls strip/fixconfig)
-# The $BASISA $DESTDIR now contain all ISAEXEC'ed bins, in the correct layout,
-# reading for packaging.
-#
-# 2) gmake only-package (which won't run through the optbuild loop) will just
-# act apon the $BASEISA. It will run the following steps:
-# pre-package (empty)
-# package-create (creates the package as per normal)
-# post-package (Sneakily adds the isaexec symlinks, and reruns package-create)
-# package-check (Standard target)
-
-
-# Gar uses the $DESTIMG variable to create these directory names, so we need to
-# change that variable to reflect a unique $ISATARGET name.
-# $DESTDIR is where the package is installed to prior to packaging. We also
-# need to make this directory name unique for each $ISA.
-# $DESTDIR is defined in the core GAR makefile, which hasn't been included yet,
-# so I have to set this variable after the main include.
-
-# Disabling for non-isaexec build, it breaks the depend generation path
-# DESTIMG=$(NAME)-$(ISA)
-
-###Optimisation section###
-#
-# This gar package builds a plain non-optimised version of Mplayer by default.
-# To build the fully optimised $ISAEXEC version use "gmake optbuild"
-#
-# $ISATARGETS represents the optimised cpu targets.
-# These targets can be used in a couple of ways. We need to feed a desired
-# optimisation target into our compiler, but we also need to create and copy
-# the binaries into the `isalist` dir structure for the final install layout.
-#
-# Unfortunately for GCC at least, these names don't match, and 64-bit is even
-# worse.
-#
-# $BASEISA is used for the base build, and for legacy use with plain "gmake".
-# The $BASEISA represents the minimum optimisation level, but it's also used as
-# the base (master) template for creating the package. All other $ISATARGET
-# builds will have their binaries and libraries copied into the $BASEISA
-# install dir, prior to final packaging.
-#
-# In theory, I should be able to just use the first string in $ISATARGET.
-# Need to work out if Makefiles support this function.
-
-# ifeq ($(shell uname -p),i386)
-# ISATARGETS ?= pentium pentium-mmx pentium2
-# BASEISA ?= pentium
-# else
-# ISATARGETS ?= v8 ultrasparc ultrasparc3
-# BASEISA ?= v8
-# endif
-
-# Mapping
-# Do Makefiles have a concept of a hash table for matching these?
-# $ISAEXEC name: | GCC mtune name:
-# pentium=pentium
-# pentium+mmx=pentium-mmx
-# pentium_pro+mmx=pentium2
-# 64-bit is athlon=amd64 but I expect -m64 will be what we're after.
-
-## #If statement for gcc needed here!
-## pentium_dir = pentium
-## pentium-mmx_dir = pentium+mmx
-## pentium2_dir = pentium_pro+mmx
-##
-## #Sparc
-## v8_dir = sparcv8
-## # ?? = sparcv8plus
-## # ?? = sparcv8plus+vis
-## ultrasparc_dir = sparcv9
-## ultrasparc3_dir = sparcv9+vis
-## #v9_dir = sparcv9+vis2
-
-
-# ISAEXEC_DIR = $($(ISA)_dir)
-
-# If you just typed gmake, this will build the stardard BASEISA build.
-# For a single optimised build use gmake ISA=your-target-here.
-# For all optimised versions ($ISAEXEC), use gmake optbuild
-# ISA ?= $(BASEISA)
-
-#Which binaries do you want to use $ISAEXEC for?
-# Note: These must be the full paths!
-# ISAEXEC_BINS = opt/csw/bin/mplayer opt/csw/bin/mencoder
-
-
-# Inclue all standard GAR variables and functionality from here onward:
include gar/category.mk
-# See earlier, we needed to set this VAR _after_ the category.mk include
-# BASE_DESTDIR :=$(DESTDIR)-$(BASEISA)
-# DESTDIR := $(DESTDIR)-$(ISA)
+PATH := /opt/csw/gnu:$(PATH)
-####Mplayer specific optimisation notes####
+# - configure is not configure !
+# - must use internal dvdnav as our library is not a snapshot and
+# mplayer uses new primitives
+# - run-time CPU detection is not implemented only for SPARC
+# - disable shared memory, used only for X11, which, in Solaris 10
+# extensions doesn't support all the required primitives,
+# e.g. XShmGetEventBase
-# Mplayer uses -mtune, not -march
+ifneq ($(GARCH),sparc)
+CPU_DETECTION =--enable-runtime-cpudetection
+else
+CPU_DETECTION =
+endif
-## # Compiler options
-## ifeq ($(GARCH),i386)
-## ifeq ($(ISA),amd64)
-## CFLAGS = -O2 -pipe -mtune=opteron
-## else
-## CFLAGS = -O2 -pipe -mtune=$(ISA)
-## endif
-## else # I.E sparc
-## CFLAGS = -O2 -pipe -mcpu=$(ISA)
-## endif
+configure-custom:
+ cd $(WORKSRC) && \
+ ./configure \
+ --cc=gcc \
+ --host-cc=gcc \
+ --extra-cflags='-std=gnu99' \
+ --extra-ldflags='-lrt' \
+ $(CPU_DETECTION) \
+ --enable-mlib \
+ --disable-shm \
+ --prefix=$(prefix) \
+ --confdir=$(sysconfdir)/$(NAME) \
+ --codecsdir=$(libexecdir)/mplayer
+ $(MAKECOOKIE)
-#CPPFLAGS = $(CFLAGS)
-#CXXFLAGS = $(CFLAGS)
-#ASFLAGS = $(CFLAGS)
-#OPTFLAGS = $(CFLAGS)
+build-custom:
+ cd $(WORKSRC) && \
+ $(MAKE) && \
+ $(MAKE) doc
+ $(MAKECOOKIE)
-# Makefile debugging/testing
-showvars:
- @echo " CFLAGS: $(CFLAGS)"
- @echo " PATCHFILES: $(PATCHFILES)"
+test-custom:
+ifdef testData
+ cd $(WORKSRC) && \
+ [ -d $(testData) ] && \
+ $(MAKE) FATE_SAMPLES=$(testData) fatetest
+endif
+ $(MAKECOOKIE)
-###Fix the standard POST_INSTALL_TARGET Definition##
-# By default Gar uses the install: target to install and then create a package.
-# The package target simply points at install: (????)
-# With this ISAEXEC framework, we actually need to separate these steps out!
-#
-# By setting the POST_INSTALL_TARGETS to the below, we're stripping off the
-# packaging phase of the install: target.
-# With the packaging steps striped, make install only installs the package into
-# it's $DESTDIR as you would expect.
-#
-# We save the full unedited definiton of $PACKAGE for later, as we still to need
-# to build a package at the end. Actually, no, I just define it manually...
-# I've created a full-package: target which runs $(FULL_PACKAGE). This will be the final step
-
-# PLAIN_PACKAGE := $(POST_INSTALL_TARGETS)
-# POST_INSTALL_TARGETS := strip fixconfig
-
-# This is the main target used by this Makefile for creating $ISAEXEC format pkgs.
-# This for loop is very important for handling the $DESTDIR var as it applies in
-# the post-install steps (I.E the ISA-specific dirs)
-
-# optbuild:
-# (for TARGET in $(ISATARGETS); do \
-# gmake -e ISA=$$TARGET build only-install; done)
-
-
-# This target is copied from gar.pkg.mk, just with $(POST_INSTALL_TARGETS) stripped
-# from the end. This prevents the install target from kicking off the packaging step.
-# only-install: $(addprefix dep-$(GARDIR)/,$(INSTALLDEPS)) test $(INSTALL_DIRS) $(PRE_INSTALL_TARGETS) pre-install $(INSTALL_TARGETS) isa-post-install
-
-
-###Tidy ups and files below
-# We need the skins dir copied into the master install dir
-# We need the default font copied into the master install dir
-# Finally, merge in all the optimised binaries
-
-#Isaexec version
-post-install-modulated: skins fonts merge-opt-bins
-
-#### Skins, Fonts, Codecs and below all need to be run from optbuild to inherit
-# the expanded $(DESTDIR) variable which includes their expanded path
-# In Mplayer's case we don't actually need the skins/fonts in each ISA build
-# but pulling them out of the loop is proving tricky
-
-
-skins:
- ginstall -m 755 -d $(DESTDIR)$(datadir)/mplayer/skins/default
- (cp -r $(WORKSRC)/../Blue/* $(DESTDIR)$(datadir)/mplayer/skins/default)
-
-fonts:
- (ln -f -s /usr/openwin/lib/X11/fonts/TrueType/Arial.ttf $(DESTDIR)$(BUILD_PREFIX)/share/mplayer/subfont.ttf)
-
-#Codecs aren't currently being bundled
-codecs:
- (mkdir -p $(DESTDIR)$(BUILD_PREFIX)/lib/codecs)
- (cp -r $(WORKSRC)/../all-20061022/* $(DESTDIR)$(BUILD_PREFIX)/share/codecs)
-
-merge-opt-bins:
- @echo "====> Running merge-opt-bins <===="
- (mkdir -p $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR))
- (cd $(DESTDIR); if test ! -f $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR)/* ; then mv $(ISAEXEC_BINS) $(BASE_DESTDIR)$(BUILD_PREFIX)/bin/$(ISAEXEC_DIR); fi )
-
-###not yet implemented, mplayer specific
-## --enable-runtime-cpudetection allows the binary to run anywhere, use for i386?
-#run-anywhere-build:
-# (gmake ISA=pentium)
-#CONFIGURE_ARGS += --enable-runtime-cpudetection
-
-PATH := /opt/csw/gnu:$(PATH)
+post-install: thedocdir = $(docdir)/$(NAME)_doc
+post-install: thehtmldocdir = $(thedocdir)/html
+post-install: thecatmandir = $(mandir)/cat1
+post-install:
+ ginstall -d "$(DESTDIR)/$(thecatmandir)"
+ gnroff -Tlatin1 -mman $(WORKSRC)/DOCS/man/en/mplayer.1 > "$(DESTDIR)/$(thecatmandir)/mplayer.1"
+ cd "$(DESTDIR)/$(thecatmandir)" && ln -s mplayer.1 mencoder.1
+ ginstall -d "$(DESTDIR)/$(thedocdir)"
+ gtar --directory $(WORKSRC)/DOCS --create --file=- tech | \
+ gtar --directory $(DESTDIR)/$(thedocdir) --extract
+ ginstall -d "$(DESTDIR)/$(thehtmldocdir)"
+ gtar --directory $(WORKSRC)/DOCS/HTML/en --create --file=- . | \
+ gtar --directory $(DESTDIR)/$(thehtmldocdir) --extract
+ $(MAKECOOKIE)
Modified: csw/mgar/pkg/mplayer/trunk/checksums
===================================================================
--- csw/mgar/pkg/mplayer/trunk/checksums 2013-12-10 19:05:07 UTC (rev 22672)
+++ csw/mgar/pkg/mplayer/trunk/checksums 2013-12-11 11:18:03 UTC (rev 22673)
@@ -1,8 +1 @@
-7e27e535c2d267637df34898f1b91707 download/MPlayer-1.0rc2.tar.bz2
-e4e2020d11b681aac898103b3ba723c4 download/Blue-1.7.tar.bz2
-f84bc9de8d2052da5c520d1a756f81b0 download/CSWmplayer.gspec
-8ed311be34e23aa24825e016b1f946aa download/CSWmplayer.depend
-8c02cf94c7af48a70c7e96e874379cb8 download/fix-configure.diff
-76866779859be662d9eeac73bf6016d3 download/fix-libavcodec-gcc-bug.diff
-1d801072350301c89f7ff58cad8f93a2 download/fix-manpage-macros.diff
-94579f5ab17c17b8d89455128ae78cef download/sparc-v8-novis.diff
+39dd55f30eb5403f219a606e79a6648a MPlayer-1.1.1.tar.xz
Added: csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0001-configure-uses-bash.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,22 @@
+From d230c38db7bcad8063f7597ff2569ceccc938e0f Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 16 Oct 2013 19:06:15 +0200
+Subject: [PATCH] configure uses bash
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 72f8ee5..f284646 100755
+--- a/configure
++++ b/configure
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /usr/bin/env bash
+ #
+ # Original version (C) 2000 Pontscho/fresh!mindworkz
+ # pontscho at makacs.poliod.hu
+--
+1.8.3.4
+
Added: csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0002-version-uses-bash.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,22 @@
+From c684fab9ad172ac202c468b95fecca7e6176e90a Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 17 Oct 2013 10:25:57 +0200
+Subject: [PATCH] version uses bash
+
+---
+ version.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/version.sh b/version.sh
+index ab9b8e8..0114248 100755
+--- a/version.sh
++++ b/version.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+
+ test "$1" && extra="-$1"
+
+--
+1.8.3.4
+
Added: csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0003-use-csw-catalog-for-documentation.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,36 @@
+From 51254d28ae3fa12862f9007ac169897e9fc740fd Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 21 Oct 2013 11:20:17 +0200
+Subject: [PATCH] use csw catalog for documentation
+
+---
+ configure | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/configure b/configure
+index f284646..53bfb0d 100755
+--- a/configure
++++ b/configure
+@@ -8057,18 +8057,7 @@ extra_ldflags="$extra_ldflags -lm"
+ # XML documentation tests
+ echocheck "XML catalogs"
+ for try_catalog in \
+- /etc/sgml/catalog \
+- /usr/share/xml/docbook/*/catalog.xml \
+- /opt/local/share/xml/docbook-xml/*/catalog.xml \
+- /opt/local/share/xml/docbook/*/catalog.xml \
+- /usr/share/sgml/docbook/*/*catalog \
+- /usr/share/apps/ksgmltools2/customization/en/catalog \
+- /usr/share/sgml/catalog \
+- /usr/local/share/sgml/catalog \
+- /usr/lib/sgml/catalog \
+- /usr/local/lib/sgml/catalog \
+- /usr/share/docbook-xml42/catalog.xml \
+- /usr/share/sgml/docbook/xmlcatalog; do
++ /opt/csw/share/sgml/docbook/xml-dtd-4.1.2/catalog; do
+ if test -f "$try_catalog"; then
+ catalog=$try_catalog
+ break
+--
+1.8.3.4
+
Added: csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0004-test-sse-support.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,91 @@
+From bafb52e605898a5afe86c5a7b007cd534c76ef1b Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 11 Dec 2013 10:25:19 +0100
+Subject: [PATCH] test sse support
+
+---
+ cpudetect.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 60 insertions(+), 1 deletion(-)
+
+diff --git a/cpudetect.c b/cpudetect.c
+index e643bdc..d2fd844 100644
+--- a/cpudetect.c
++++ b/cpudetect.c
+@@ -46,6 +46,10 @@ CpuCaps gCpuCaps;
+ #include <os2.h>
+ #elif defined(__AMIGAOS4__)
+ #include <proto/exec.h>
++#elif defined(sun)
++#include <errno.h>
++#include <sys/utsname.h>
++#include <sys/auxv.h>
+ #endif
+
+ /* Thanks to the FreeBSD project for some of this cpuid code, and
+@@ -209,7 +213,62 @@ static void check_os_katmai_support( void )
+ * safe to go ahead and hook out the SSE code throughout Mesa.
+ */
+ mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" );
+-#else
++#elif defined(sun)
++ /* determine if SSE is available for the current CPU running
++ * Solaris in 32 bit mode; this can be done only for 5.10 or
++ * greater.
++ */
++ struct utsname un;
++ char* dot;
++ int minor;
++ int major;
++ uint_t ui;
++ gCpuCaps.hasSSE=0;
++ if(uname(&un) != -1)
++ {
++ if(strcmp(un.sysname, "SunOS") == 0)
++ {
++ dot = strchr(un.release, '.');
++ errno = 0;
++ if(dot != (char*)0)
++ {
++ minor = atoi(dot + 1);
++ *dot = '\0';
++ if(!errno)
++ {
++ major = atoi(un.release);
++ if(!errno)
++ {
++ if(major >= 5 && minor >= 10)
++ {
++ (void)getisax(&ui, 1);
++ if(ui & AV_386_SSE)
++ {
++ gCpuCaps.hasSSE=1;
++ }
++ if(ui & AV_386_SSE2)
++ {
++ gCpuCaps.hasSSE2=1;
++ }
++ if(ui & AV_386_SSE3)
++ {
++ gCpuCaps.hasSSE3=1;
++ }
++ if(ui & AV_386_SSSE3)
++ {
++ gCpuCaps.hasSSSE3=1;
++ }
++ if(ui & AV_386_AMD_SSE4A)
++ {
++ gCpuCaps.hasSSE4a=1;
++ }
++ }
++ }
++ }
++ }
++ }
++ }
++#else /* : defined(sun) */
+ /* We can't use POSIX signal handling to test the availability of
+ * SSE, so we disable it by default.
+ */
+--
+1.8.4.1
+
Added: csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0005-enhance-X-Windows-detection.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,56 @@
+From f65b3b496e17ae71669e9dd3b3431ac709898e82 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 22 Oct 2013 14:12:27 +0200
+Subject: [PATCH] enhance X Windows detection
+
+---
+ configure | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 53bfb0d..407837e 100755
+--- a/configure
++++ b/configure
+@@ -4443,6 +4443,12 @@ echocheck "X11 headers presence"
+ fi
+ echores "$_x11_headers"
+
++ifBroken=''
++needsXlib=''
++if sunos; then
++ ifBroken="_broken"
++ needsXlib="X11/Xlib.h"
++fi
+
+ echocheck "X11"
+ if test "$_x11" = auto && test "$_x11_headers" = yes ; then
+@@ -4454,7 +4460,7 @@ if test "$_x11" = auto && test "$_x11_headers" = yes ; then
+ else
+ ld_tmp="$I -lXext -lX11 $ld_pthread"
+ fi
+- statement_check X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp &&
++ statement_check${ifBroken} ${needsXlib} X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp &&
+ libs_mplayer="$libs_mplayer $ld_tmp" && _x11=yes && break
+ done
+ fi
+@@ -4472,7 +4478,7 @@ echores "$_x11"
+ echocheck "Xss screensaver extensions"
+ if test "$_xss" = auto ; then
+ _xss=no
+- statement_check "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes
++ statement_check${ifBroken} ${neddsXlib} "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes
+ fi
+ if test "$_xss" = yes ; then
+ def_xss='#define CONFIG_XSS 1'
+@@ -4598,7 +4604,7 @@ echores "$_vdpau"
+ echocheck "Xinerama"
+ if test "$_xinerama" = auto && test "$_x11" = yes ; then
+ _xinerama=no
+- statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes
++ statement_check${ifBroken} ${needsXlib} X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes
+ fi
+
+ if test "$_xinerama" = yes ; then
+--
+1.8.3.4
+
Added: csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0006-fix-memalign-detection.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,24 @@
+From 291e34c28c9d9e7f488da650d0df9e907d14f991 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 23 Oct 2013 14:34:30 +0200
+Subject: [PATCH] fix memalign detection
+
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index 407837e..89368a7 100755
+--- a/configure
++++ b/configure
+@@ -3703,6 +3703,7 @@ echocheck "memalign()"
+ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
+ _memalign=no
+ statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes
++sunos && [ "${_memalign}" = "no" ] && statement_check stdlib.h 'memalign(64, sizeof(char))' && _memalign=yes
+ if test "$_memalign" = yes ; then
+ def_memalign='#define HAVE_MEMALIGN 1'
+ else
+--
+1.8.3.4
+
Added: csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0007-fix-memalign-prototype.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,27 @@
+From 7882916405a07afa33871ee8b70274c3302b259c Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 11 Dec 2013 09:55:24 +0100
+Subject: [PATCH] fix memalign prototype
+
+---
+ ffmpeg/libavutil/mem.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpeg/libavutil/mem.c b/ffmpeg/libavutil/mem.c
+index de22ad8..d3086c8 100644
+--- a/ffmpeg/libavutil/mem.c
++++ b/ffmpeg/libavutil/mem.c
+@@ -30,6 +30,10 @@
+
+ #include <limits.h>
+ #include <stdlib.h>
++#if defined(sun)
++/* when _XOPEN_SOURCE is defined, the prototype is excluded from stdlib!? */
++extern void *memalign(size_t, size_t);
++#endif /* : defined(sun) */
+ #include <string.h>
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+--
+1.8.4.1
+
Added: csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch
===================================================================
--- csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch (rev 0)
+++ csw/mgar/pkg/mplayer/trunk/files/0008-ffmpeg-script-uses-bash.patch 2013-12-11 11:18:03 UTC (rev 22673)
@@ -0,0 +1,33 @@
+From 8fb46fc11b2cb11fe712ad67713b5d614a400f4c Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 11 Dec 2013 10:59:11 +0100
+Subject: [PATCH] ffmpeg script uses bash
+
+---
+ ffmpeg/libavcodec/codec_names.sh | 2 +-
+ ffmpeg/version.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ffmpeg/libavcodec/codec_names.sh b/ffmpeg/libavcodec/codec_names.sh
+index 0e499c9..dcb3437 100755
+--- a/ffmpeg/libavcodec/codec_names.sh
++++ b/ffmpeg/libavcodec/codec_names.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+
+ # Copyright (c) 2011 Nicolas George
+ #
+diff --git a/ffmpeg/version.sh b/ffmpeg/version.sh
+index 8d084c2..9fa06c7 100755
+--- a/ffmpeg/version.sh
++++ b/ffmpeg/version.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+
+ # check for git short hash
+ if ! test "$revision"; then
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list