SF.net SVN: gar:[22222] csw/mgar/pkg/libdvdcss/trunk

[pfelecan at users.sourceforge.net]

Revision: 22222
          http://gar.svn.sourceforge.net/gar/?rev=22222&view=rev
Author:   pfelecan
Date:     2013-10-15 09:22:28 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
libdvdcss/trunk:
- bumped to last stable revision from upstream
- adapted the recipe to the current version of gar
- patched USCSI detection
- removed old cruft

Modified Paths:
--------------
    csw/mgar/pkg/libdvdcss/trunk/Makefile
    csw/mgar/pkg/libdvdcss/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch

Removed Paths:
-------------
    csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend
    csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec

Modified: csw/mgar/pkg/libdvdcss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdvdcss/trunk/Makefile	2013-10-15 07:11:41 UTC (rev 22221)
+++ csw/mgar/pkg/libdvdcss/trunk/Makefile	2013-10-15 09:22:28 UTC (rev 22222)
@@ -1,23 +1,29 @@
-NAME = libdvdcss
-VERSION = 1.2.9
-GARTYPE = v1
+# $Id$
 
-DESCRIPTION = library for accessing DVDs like a block device without having to bother about decryption
+NAME	=	libdvdcss
+VERSION	=	1.2.13
+GARTYPE	=	v2
+
+DESCRIPTION	=	Library for accessing DVDs like a block device without having to bother about decryption
+
 define BLURB
-library for accessing DVDs like a block device without having to bother about decryption
+	Library for accessing DVDs like a block device without having to bother about decryption
 endef
 
-MASTER_SITES = http://download.videolan.org/pub/libdvdcss/1.2.9/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWlibdvdcss, depend )
+MASTER_SITES	=	http://download.videolan.org/pub/$(NAME)/$(VERSION)/
+DISTFILES 		=	$(NAME)-$(VERSION).tar.bz2
+PATCHFILES		+=	0001-fix-uscsi-detection.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+GARCOMPILER		=	GNU
 
-GARCOMPILER ?= GNU
+CONFIGURE_ARGS	=	$(DIRPATHS)
 
-CONFIGURE_ARGS = $(DIRPATHS)
+RUNTIME_DEP_PKGS_CSWlibdvdcss += CSWlibgcc-s1
 
-#ENABLE_TEST = 0
+include gar/category.mk
 
-include gar/category.mk
+PATH := /opt/csw/gnu:$(PATH)
+
+pre-configure-modulated:
+	cd $(WORKSRC); autoreconf -fi
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libdvdcss/trunk/checksums
===================================================================
--- csw/mgar/pkg/libdvdcss/trunk/checksums	2013-10-15 07:11:41 UTC (rev 22221)
+++ csw/mgar/pkg/libdvdcss/trunk/checksums	2013-10-15 09:22:28 UTC (rev 22222)
@@ -1,3 +1 @@
-bec67a57436a7f80c5aeb3c3abccbd9e  download/libdvdcss-1.2.9.tar.gz
-975b7e10de329f223bc0e81b00b08f4b  download/CSWlibdvdcss.gspec
-4f37936126869c441ba900ecc362bc00  download/CSWlibdvdcss.depend
+53cfc52a60a156763c425572e5179273  libdvdcss-1.2.13.tar.bz2

Added: csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch
===================================================================
--- csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch	                        (rev 0)
+++ csw/mgar/pkg/libdvdcss/trunk/files/0001-fix-uscsi-detection.patch	2013-10-15 09:22:28 UTC (rev 22222)
@@ -0,0 +1,25 @@
+From 5466eff64940b0a089f0b38869122079803e4194 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 15 Oct 2013 11:05:41 +0200
+Subject: [PATCH] fix uscsi detection
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a736aac..3c13580 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -174,7 +174,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
+   dnl Solaris: sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h
+   dnl
+   solaris_uscsi=yes
+-  AC_CHECK_HEADERS([sys/scsi/scsi_types.h, sys/scsi/impl/uscsi.h], [],
++  AC_CHECK_HEADERS([sys/scsi/scsi_types.h sys/scsi/impl/uscsi.h], [],
+     [solaris_uscsi=no; break;])
+   AS_IF([test "$solaris_uscsi" = "yes"], [
+     AC_DEFINE(SOLARIS_USCSI, 1, Have userspace SCSI headers.)
+-- 
+1.8.3.4
+

Deleted: csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend
===================================================================
--- csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend	2013-10-15 07:11:41 UTC (rev 22221)
+++ csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.depend	2013-10-15 09:22:28 UTC (rev 22222)
@@ -1,2 +0,0 @@
-P CSWgcc3corert gcc3corert - GNU C Compiler Run Time
-P CSWgcc3g++rt gcc3g++rt - GNU C++ Compiler Run Time

Deleted: csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec
===================================================================
--- csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec	2013-10-15 07:11:41 UTC (rev 22221)
+++ csw/mgar/pkg/libdvdcss/trunk/files/CSWlibdvdcss.gspec	2013-10-15 09:22:28 UTC (rev 22222)
@@ -1,4 +0,0 @@
-%var            bitname libdvdcss
-%var            pkgname CSWlibdvdcss
-%include        url file://%{GARDIR}/pkglib/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.