SF.net SVN: gar:[22272] csw/mgar/pkg/mplayer/branches/snapshot
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Mon Oct 21 12:03:09 CEST 2013
Revision: 22272
http://gar.svn.sourceforge.net/gar/?rev=22272&view=rev
Author: pfelecan
Date: 2013-10-21 10:03:08 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
mplayer/branches/snapshot: split in sub-packages and add documentation
Modified Paths:
--------------
csw/mgar/pkg/mplayer/branches/snapshot/Makefile
Added Paths:
-----------
csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch
Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 09:10:41 UTC (rev 22271)
+++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile 2013-10-21 10:03:08 UTC (rev 22272)
@@ -23,6 +23,7 @@
frontends exist but are not included.
endef
+VENDOR_URL = http://www.mplayerhq.hu/MPlayer/
MASTER_SITES = http://www.mplayerhq.hu/MPlayer/releases/
MASTER_SITES += http://ffmpeg.org/releases/
DISTFILES = $(NAME)-export-snapshot.tar.bz2
@@ -30,10 +31,13 @@
DISTNAME = $(NAME)-export-$(YEAR)-$(MONTH)-$(DAY)
PATCHFILES += 0001-configure-uses-bash.patch
PATCHFILES += 0002-version-uses-bash.patch
+PATCHFILES += 0003-use-csw-catalog-for-documentation.patch
PACKAGING_PLATFORMS = solaris10-sparc
PACKAGING_PLATFORMS += solaris10-i386
+BUILD_DEP_PKGS += CSWdocbookdtds
+BUILD_DEP_PKGS += CSWdocbookxsl
BUILD_DEP_PKGS += CSWfaac
BUILD_DEP_PKGS += CSWfontconfig-dev
BUILD_DEP_PKGS += CSWliba52
@@ -78,59 +82,41 @@
BUILD_SCRIPTS = custom
TEST_SCRIPTS = custom
-RUNTIME_DEP_PKGS_CSWmplayer += CSWfaac
-RUNTIME_DEP_PKGS_CSWmplayer += CSWliba52
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaa1
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibaudiofile0
-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 += CSWlibjpeg62
-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 += CSWlibpng12-0
-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 += CSWlibvorbis0
-RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2
-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
+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 += 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 += CSWlibjpeg62
+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 += CSWlibpng12-0
+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 += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWmplayer += CSWlibvorbisenc2
+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
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liba52.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libbz2.so.1
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaac.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfaad.so.2
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfontconfig.so.1
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfreetype.so.6
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libfribidi.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libiconv.so.2
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libjpeg.so.62
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libkstat.so.1
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|liblzo2.so.2
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmad.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmp3lame.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libmpg123.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libogg.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libpng12.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|librtmp.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libspeex.so.1
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libtheoradec.so.1
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbis.so.0
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbisenc.so.2
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libx264.so.133
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libxvidcore.so.4
-CHECKPKG_OVERRIDES_CSWmplayer += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libz.so.1
+# only on BO build farm; on my build farm it's included and detected TODO
+CHECKPKG_OVERRIDES_CSWmplayer += surplus-dependency|CSWlibaudiofile0
+
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|libXt.so.4
@@ -163,6 +149,68 @@
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
+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
+
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWliba52
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibxvidcore4
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmp3lame0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfaad2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibx264-133
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibjpeg62
+RUNTIME_DEP_PKGS_CSWmencoder += CSWfaac
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibrtmp0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWliblzo2-2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibz1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWlibmad0
+RUNTIME_DEP_PKGS_CSWmencoder += CSWmpg123
+RUNTIME_DEP_PKGS_CSWmencoder += CSWmplayer
+CHECKPKG_OVERRIDES_CSWmencoder += surplus-dependency|CSWmplayer
+
+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
+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.62
+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|libpng12.so.0
+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|libvorbis.so.0
+CHECKPKG_OVERRIDES_CSWmencoder += no-direct-binding|/opt/csw/bin/mencoder|is|not|directly|bound|to|soname|libvorbisenc.so.2
+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
+
+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
+
include gar/category.mk
PATH := /opt/csw/gnu:$(PATH)
@@ -195,7 +243,8 @@
build-custom:
cd $(WORKSRC) && \
- $(MAKE)
+ $(MAKE) && \
+ $(MAKE) doc
$(MAKECOOKIE)
test-custom:
@@ -205,3 +254,14 @@
$(MAKE) FATE_SAMPLES=$(testData) fatetest
endif
$(MAKECOOKIE)
+
+post-install: thedocdir = $(docdir)/$(NAME)_doc
+post-install: thehtmldocdir = $(thedocdir)/html
+post-install:
+ 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)
Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch (rev 0)
+++ csw/mgar/pkg/mplayer/branches/snapshot/files/0003-use-csw-catalog-for-documentation.patch 2013-10-21 10:03:08 UTC (rev 22272)
@@ -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
+
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