Attachment 109421 Details for Bug 150450 – libdvdread.diff

[patch] libdvdread.diff

libdvdread.diff (text/x-patch; charset="UTF-8"), 3.77 KB, created by Max Brazhnikov on 2010-09-12 20:11:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2010-09-12 20:11:35 UTC

Size: 3.77 KB

patch

obsolete

>diff -ruN --exclude=.svn --exclude=CVS libdvdread.orig/Makefile libdvdread/Makefile
>--- libdvdread.orig/Makefile	2010-09-12 22:53:41.793990015 +0400
>+++ libdvdread/Makefile	2010-09-12 22:51:43.147700479 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	libdvdread
>-PORTVERSION=	4.1.4.1217
>+PORTVERSION=	4.1.4.r1217
> CATEGORIES=	multimedia
> # Svn repository URL : svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
> MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
>@@ -17,6 +17,7 @@
> 		http://www5.mplayerhq.hu/MPlayer/releases/dvdnav/ \
> 		ftp://ftp1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
> 		ftp://ftp2.mplayerhq.hu/MPlayer/releases/dvdnav/
>+DISTNAME=	${PORTNAME}-${PORTVERSION:S,r,,}
> 
> MAINTAINER=	ganael.laplanche@martymac.org
> COMMENT=	MPlayer version of the libdvdread project
>diff -ruN --exclude=.svn --exclude=CVS libdvdread.orig/files/patch-Makefile libdvdread/files/patch-Makefile
>--- libdvdread.orig/files/patch-Makefile	2009-02-08 21:45:35.000000000 +0300
>+++ libdvdread/files/patch-Makefile	2010-09-12 22:46:06.896545224 +0400
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2008-08-31 11:27:37.000000000 +0200
>-+++ Makefile	2008-10-04 12:42:55.833207676 +0200
>-@@ -90,8 +90,8 @@
>+--- ./Makefile.orig	2010-09-06 15:36:58.000000000 +0400
>++++ ./Makefile	2010-09-12 22:39:12.287474738 +0400
>+@@ -90,24 +90,20 @@
>  # Install targets
>  
>  install-headers:
>@@ -11,7 +11,25 @@
>  
>  install-shared: $(SHLIB)
>  	install -d $(DESTDIR)$(shlibdir)
>-@@ -154,8 +154,8 @@
>+ 
>+ 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \
>+-		$(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
>++		$(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_MAJOR)
>+ 
>+ 	cd $(DESTDIR)$(shlibdir) && \
>+-		ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
>+-	cd $(DESTDIR)$(shlibdir) && \
>+ 		ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
>+ 
>+ 	install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
>+-		$(DESTDIR)$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
>+-	cd $(DESTDIR)$(shlibdir) && \
>+-		ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
>++		$(DESTDIR)$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_MAJOR)
>+ 	cd $(DESTDIR)$(shlibdir) && \
>+ 		ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB)
>+ 
>+@@ -154,8 +150,8 @@
>  	$(pcedit) $< > $@
>  
>  install-pkgconfig: $(.OBJDIR)/dvdread.pc
>diff -ruN --exclude=.svn --exclude=CVS libdvdread.orig/files/patch-configure2 libdvdread/files/patch-configure2
>--- libdvdread.orig/files/patch-configure2	2010-09-12 21:26:49.000000000 +0400
>+++ libdvdread/files/patch-configure2	2010-09-12 22:46:06.892430973 +0400
>@@ -1,5 +1,14 @@
>---- configure2.orig	2010-09-06 11:36:58.000000000 +0000
>-+++ configure2	2010-09-07 13:01:25.216794661 +0000
>+--- ./configure2.orig	2010-09-06 15:36:58.000000000 +0400
>++++ ./configure2	2010-09-12 22:33:58.407289498 +0400
>+@@ -1,7 +1,7 @@
>+ #!/bin/sh
>+ 
>+ dvdread_sh_version=4.1.4
>+-dvdread_sh_major=`echo $dvdread_sh_version | awk -F. '{print $1}'`
>++dvdread_sh_major=5
>+ 
>+ cc=gcc
>+ make=make
> @@ -26,6 +26,7 @@
>    echo "  --help                   print this message"
>    echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
>diff -ruN --exclude=.svn --exclude=CVS libdvdread.orig/pkg-plist libdvdread/pkg-plist
>--- libdvdread.orig/pkg-plist	2010-09-12 21:26:49.000000000 +0400
>+++ libdvdread/pkg-plist	2010-09-12 22:50:02.247245318 +0400
>@@ -1,16 +1,15 @@
> bin/dvdread-config
>+include/dvdread/bitreader.h
> include/dvdread/dvd_reader.h
>+include/dvdread/dvd_udf.h
> include/dvdread/ifo_print.h
> include/dvdread/ifo_read.h
> include/dvdread/ifo_types.h
> include/dvdread/nav_print.h
> include/dvdread/nav_read.h
>-include/dvdread/dvd_udf.h
> include/dvdread/nav_types.h
>-include/dvdread/bitreader.h
>-@dirrm include/dvdread
>-lib/libdvdread.so.4.1.4
>-lib/libdvdread.so.4
>-lib/libdvdread.so
> lib/libdvdread.a
>+lib/libdvdread.so
>+lib/libdvdread.so.5
> libdata/pkgconfig/dvdread.pc
>+@dirrm include/dvdread

Actions: View | Diff

Attachments on bug 150450: 109420 | 109421 | 109422