pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ogle Primary object is to make this build w...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ff28e2f16833
branches: trunk
changeset: 601975:ff28e2f16833
user: he <he%pkgsrc.org@localhost>
date: Sat Apr 07 08:28:45 2012 +0000
description:
Primary object is to make this build with libdvdread 4.2.0 (patch-ad)
Additionally:
* Mark it as also working with libdvdread 4.1.3
* Add comments to the patches
* Add LICENSE=gnu-gpl-v2
This fixes all pkglint warnings.
OK'ed by wiz@
diffstat:
multimedia/ogle/Makefile | 8 +-
multimedia/ogle/distinfo | 10 +-
multimedia/ogle/patches/patch-aa | 4 +-
multimedia/ogle/patches/patch-ab | 4 +-
multimedia/ogle/patches/patch-ac | 4 +-
multimedia/ogle/patches/patch-ad | 218 +++++++++++++++++++-------------------
6 files changed, 129 insertions(+), 119 deletions(-)
diffs (truncated from 324 to 300 lines):
diff -r 2891eb6b81d9 -r ff28e2f16833 multimedia/ogle/Makefile
--- a/multimedia/ogle/Makefile Sat Apr 07 04:47:27 2012 +0000
+++ b/multimedia/ogle/Makefile Sat Apr 07 08:28:45 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2011/04/22 13:44:17 obache Exp $
+# $NetBSD: Makefile,v 1.29 2012/04/07 08:28:45 he Exp $
DISTNAME= ogle-0.9.2
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
@@ -9,6 +9,8 @@
HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/
COMMENT= DVD player with menus
+LICENSE= gnu-gpl-v2
+
PKG_DESTDIR_SUPPORT= user-destdir
ONLY_FOR_PLATFORM= NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386
@@ -39,6 +41,8 @@
MESSAGE_SUBST+= PKGBASE=${PKGBASE}
+BUILDLINK_API_DEPENDS.libdvdread+= libdvdread>=4.1.3
+
.include "../../audio/liba52/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff -r 2891eb6b81d9 -r ff28e2f16833 multimedia/ogle/distinfo
--- a/multimedia/ogle/distinfo Sat Apr 07 04:47:27 2012 +0000
+++ b/multimedia/ogle/distinfo Sat Apr 07 08:28:45 2012 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2009/01/27 02:06:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.6 2012/04/07 08:28:45 he Exp $
SHA1 (ogle-0.9.2.tar.gz) = bf44e835d04634b4e52fb50bab2a1b78e69391eb
RMD160 (ogle-0.9.2.tar.gz) = 16055614b5a3b336aa42a96efc0456bf88f37129
Size (ogle-0.9.2.tar.gz) = 488984 bytes
-SHA1 (patch-aa) = e88f4c4765a72afe9e6a1bb859d37adb040c3d48
-SHA1 (patch-ab) = 8cc4f41533feeb35a4b9400aadea230c40f91c3d
-SHA1 (patch-ac) = 3cee7186c517fc7427a9a4a4b96680f25d442c1d
-SHA1 (patch-ad) = 15f6466ab82811bebb169a6cd0886c92e34033ec
+SHA1 (patch-aa) = 95778b6a78f8d37416428bc27b709ed64bf4533a
+SHA1 (patch-ab) = 0a4837639fd3e0dbab6ff804962f62fd7971582c
+SHA1 (patch-ac) = c30136ad38ff2238abfafe0fad419a4214acbb03
+SHA1 (patch-ad) = d1e9150f7544175f4bdf3b3fbc8fb3d072c04b5c
diff -r 2891eb6b81d9 -r ff28e2f16833 multimedia/ogle/patches/patch-aa
--- a/multimedia/ogle/patches/patch-aa Sat Apr 07 04:47:27 2012 +0000
+++ b/multimedia/ogle/patches/patch-aa Sat Apr 07 08:28:45 2012 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2005/12/07 19:33:03 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Also handle DragonFly BSD.
--- include/ogle_endian.h.orig 2005-12-07 19:00:42.000000000 +0000
+++ include/ogle_endian.h
diff -r 2891eb6b81d9 -r ff28e2f16833 multimedia/ogle/patches/patch-ab
--- a/multimedia/ogle/patches/patch-ab Sat Apr 07 04:47:27 2012 +0000
+++ b/multimedia/ogle/patches/patch-ab Sat Apr 07 08:28:45 2012 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/12/07 19:33:03 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Also handle DragonFly BSD.
--- configure.orig 2005-12-07 19:04:43.000000000 +0000
+++ configure
diff -r 2891eb6b81d9 -r ff28e2f16833 multimedia/ogle/patches/patch-ac
--- a/multimedia/ogle/patches/patch-ac Sat Apr 07 04:47:27 2012 +0000
+++ b/multimedia/ogle/patches/patch-ac Sat Apr 07 08:28:45 2012 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2006/07/16 22:20:37 seb Exp $
+$NetBSD: patch-ac,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Make program_name a global.
--- ac3/ac3dec_wrap.c.orig 2003-03-02 15:50:03.000000000 +0000
+++ ac3/ac3dec_wrap.c
diff -r 2891eb6b81d9 -r ff28e2f16833 multimedia/ogle/patches/patch-ad
--- a/multimedia/ogle/patches/patch-ad Sat Apr 07 04:47:27 2012 +0000
+++ b/multimedia/ogle/patches/patch-ad Sat Apr 07 08:28:45 2012 +0000
@@ -1,129 +1,129 @@
-$NetBSD: patch-ad,v 1.1 2009/01/27 02:06:49 jmcneill Exp $
+$NetBSD: patch-ad,v 1.2 2012/04/07 08:28:45 he Exp $
+
+Adapt to libdvdread 4.2.0 (actually >= 4.1.3).
---- vmg/ifo_dump.c.orig 2009-01-26 21:00:17.000000000 -0500
-+++ vmg/ifo_dump.c 2009-01-26 21:00:33.000000000 -0500
-@@ -65,38 +65,38 @@ static void print_ifo(char *path, int ti
- if(h->vmgi_mat != NULL) {
+--- vmg/ifo_dump.c.orig 2003-06-25 16:12:43.000000000 +0000
++++ vmg/ifo_dump.c
+@@ -59,121 +59,8 @@ static void print_ifo(char *path, int ti
+ return;
+ }
+
+- if((h = ifoOpen(dvd, title)) == NULL)
+- return;
+-
+- if(h->vmgi_mat != NULL) {
++ ifo_print(dvd, title);
- printf("VMG top level\n-------------\n");
+- printf("VMG top level\n-------------\n");
- ifoPrint_VMGI_MAT(h->vmgi_mat);
-+ ifo_print_VMGI_MAT(h->vmgi_mat);
-
- printf("\nFirst Play PGC\n--------------\n");
+-
+- printf("\nFirst Play PGC\n--------------\n");
- ifoPrint_PGC(h->first_play_pgc);
-+ ifo_print_PGC(h->first_play_pgc);
-
- printf("\nTitle Track search pointer table\n");
- printf( "------------------------------------------------\n");
+-
+- printf("\nTitle Track search pointer table\n");
+- printf( "------------------------------------------------\n");
- ifoPrint_TT_SRPT(h->tt_srpt);
-+ ifo_print_TT_SRPT(h->tt_srpt);
-
- printf("\nMenu PGCI Unit table\n");
- printf( "--------------------\n");
- if(h->vmgi_mat->vmgm_pgci_ut != 0) {
+-
+- printf("\nMenu PGCI Unit table\n");
+- printf( "--------------------\n");
+- if(h->vmgi_mat->vmgm_pgci_ut != 0) {
- ifoPrint_PGCI_UT(h->pgci_ut);
-+ ifo_print_PGCI_UT(h->pgci_ut);
- } else
- printf("No Menu PGCI Unit table present\n");
-
- printf("\nParental Manegment Information table\n");
- printf( "------------------------------------\n");
- if(h->vmgi_mat->ptl_mait != 0) {
+- } else
+- printf("No Menu PGCI Unit table present\n");
+-
+- printf("\nParental Manegment Information table\n");
+- printf( "------------------------------------\n");
+- if(h->vmgi_mat->ptl_mait != 0) {
- ifoPrint_PTL_MAIT(h->ptl_mait);
-+ ifo_print_PTL_MAIT(h->ptl_mait);
- } else
- printf("No Parental Management Information present\n");
-
- printf("\nVideo Title Set Attribute Table\n");
- printf( "-------------------------------\n");
+- } else
+- printf("No Parental Management Information present\n");
+-
+- printf("\nVideo Title Set Attribute Table\n");
+- printf( "-------------------------------\n");
- ifoPrint_VTS_ATRT(h->vts_atrt);
-+ ifo_print_VTS_ATRT(h->vts_atrt);
-
-
- printf("\nText Data Manager Information\n");
- printf( "-----------------------------\n");
- if(h->vmgi_mat->txtdt_mgi != 0) {
+-
+-
+- printf("\nText Data Manager Information\n");
+- printf( "-----------------------------\n");
+- if(h->vmgi_mat->txtdt_mgi != 0) {
- //ifoPrint_TXTDT_MGI(h->txtdt_mgi);
-+ //ifo_print_TXTDT_MGI(h->txtdt_mgi);
- printf("Can't print Text Data Manager Information yet\n");
- } else
- printf("No Text Data Manager Information present\n");
-@@ -106,14 +106,14 @@ static void print_ifo(char *path, int ti
- printf("\nCell Address table\n");
- printf( "-----------------\n");
- if(h->vmgi_mat->vmgm_c_adt != 0) {
+- printf("Can't print Text Data Manager Information yet\n");
+- } else
+- printf("No Text Data Manager Information present\n");
+-
+- if(1) {
+-
+- printf("\nCell Address table\n");
+- printf( "-----------------\n");
+- if(h->vmgi_mat->vmgm_c_adt != 0) {
- ifoPrint_C_ADT(h->menu_c_adt);
-+ ifo_print_C_ADT(h->menu_c_adt);
- } else
- printf("No Cell Address table present\n");
-
- printf("\nVideo Title set Menu VOBU address map\n");
- printf( "-----------------\n");
- if(h->vmgi_mat->vmgm_vobu_admap != 0) {
+- } else
+- printf("No Cell Address table present\n");
+-
+- printf("\nVideo Title set Menu VOBU address map\n");
+- printf( "-----------------\n");
+- if(h->vmgi_mat->vmgm_vobu_admap != 0) {
- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
-+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
- } else
- printf("No Menu VOBU address map present\n");
- }
-@@ -122,20 +122,20 @@ static void print_ifo(char *path, int ti
- if(h->vtsi_mat != NULL) {
-
- printf("VTS top level\n-------------\n");
+- } else
+- printf("No Menu VOBU address map present\n");
+- }
+- }
+-
+- if(h->vtsi_mat != NULL) {
+-
+- printf("VTS top level\n-------------\n");
- ifoPrint_VTSI_MAT(h->vtsi_mat);
-+ ifo_print_VTSI_MAT(h->vtsi_mat);
-
- printf("\nPart of title search pointer table information\n");
- printf( "----------------------------------------------\n");
+-
+- printf("\nPart of title search pointer table information\n");
+- printf( "----------------------------------------------\n");
- ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt);
-+ ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt);
-
- printf("\nPGCI Unit table\n");
- printf( "--------------------\n");
+-
+- printf("\nPGCI Unit table\n");
+- printf( "--------------------\n");
- ifoPrint_PGCIT(h->vts_pgcit);
-+ ifo_print_PGCIT(h->vts_pgcit);
-
- printf("\nMenu PGCI Unit table\n");
- printf( "--------------------\n");
- if(h->vtsi_mat->vtsm_pgci_ut != 0) {
+-
+- printf("\nMenu PGCI Unit table\n");
+- printf( "--------------------\n");
+- if(h->vtsi_mat->vtsm_pgci_ut != 0) {
- ifoPrint_PGCI_UT(h->pgci_ut);
-+ ifo_print_PGCI_UT(h->pgci_ut);
- } else
- printf("No Menu PGCI Unit table present\n");
-
-@@ -144,31 +144,31 @@ static void print_ifo(char *path, int ti
- printf("\nTime Map table\n");
- printf( "-----------------\n");
- if(h->vtsi_mat->vts_tmapt != 0) {
+- } else
+- printf("No Menu PGCI Unit table present\n");
+-
+- if(1) {
+-
+- printf("\nTime Map table\n");
+- printf( "-----------------\n");
+- if(h->vtsi_mat->vts_tmapt != 0) {
- ifoPrint_VTS_TMAPT(h->vts_tmapt);
-+ ifo_print_VTS_TMAPT(h->vts_tmapt);
- } else
- printf("No Time Map table present\n");
-
- printf("\nMenu Cell Address table\n");
- printf( "-----------------\n");
- if(h->vtsi_mat->vtsm_c_adt != 0) {
+- } else
+- printf("No Time Map table present\n");
+-
+- printf("\nMenu Cell Address table\n");
+- printf( "-----------------\n");
+- if(h->vtsi_mat->vtsm_c_adt != 0) {
- ifoPrint_C_ADT(h->menu_c_adt);
-+ ifo_print_C_ADT(h->menu_c_adt);
- } else
- printf("No Cell Address table present\n");
-
- printf("\nVideo Title Set Menu VOBU address map\n");
- printf( "-----------------\n");
- if(h->vtsi_mat->vtsm_vobu_admap != 0) {
+- } else
+- printf("No Cell Address table present\n");
+-
+- printf("\nVideo Title Set Menu VOBU address map\n");
+- printf( "-----------------\n");
+- if(h->vtsi_mat->vtsm_vobu_admap != 0) {
- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
-+ ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
- } else
- printf("No Menu VOBU address map present\n");
-
- printf("\nCell Address table\n");
- printf( "-----------------\n");
+- } else
+- printf("No Menu VOBU address map present\n");
Home |
Main Index |
Thread Index |
Old Index