Attachment 908583 Details for Bug 1105762 – Additional patch 1

[patch] Additional patch 1

libdvdnav-multilib.patch (text/plain), 2.08 KB, created by Simon Lewis on 2014-06-13 13:26:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Lewis

Created: 2014-06-13 13:26:48 UTC

Size: 2.08 KB

patch

obsolete

>diff -up libdvdnav-4.1.3/Makefile.multilib libdvdnav-4.1.3/Makefile
>--- libdvdnav-4.1.3/Makefile.multilib	2008-12-30 15:48:46.000000000 +0100
>+++ libdvdnav-4.1.3/Makefile	2009-09-27 00:36:48.000000000 +0200
>@@ -143,12 +143,6 @@ distclean: clean
> dvdnav-config: $(.OBJDIR)/dvdnav-config
> $(.OBJDIR)/dvdnav-config: $(BUILDDEPS)
> 	@echo '#!/bin/sh' > $(.OBJDIR)/dvdnav-config
>-	@echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdnav-config
>-	@echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdnav-config
>-	@echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdnav-config
>-	@echo 'dvdread_cflags="'$(DVDREAD_CFLAGS)'"' >> $(.OBJDIR)/dvdnav-config
>-	@echo 'dvdread_libs="'$(DVDREAD_LIBS)'"' >> $(.OBJDIR)/dvdnav-config
>-	@echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config
> 	@echo >> $(.OBJDIR)/dvdnav-config
> 	cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config
> 	chmod 0755 $(.OBJDIR)/dvdnav-config
>diff -up libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib libdvdnav-4.1.3/misc/dvdnav-config2.sh
>--- libdvdnav-4.1.3/misc/dvdnav-config2.sh.multilib	2008-10-10 00:20:01.000000000 +0200
>+++ libdvdnav-4.1.3/misc/dvdnav-config2.sh	2009-09-27 00:34:39.000000000 +0200
>@@ -30,7 +30,7 @@ while test $# -gt 0; do
>       echo_prefix=yes
>       ;;
>     --version)
>-      echo $version
>+      echo `pkg-config --modversion dvdnav`
>       ;;
>     --cflags)
>       echo_cflags=yes
>@@ -52,21 +52,21 @@ while test $# -gt 0; do
> done
> 
> if test "$echo_prefix" = "yes"; then
>-	echo $prefix
>+      echo `pkg-config --variable=prefix dvdnav`
> fi
> 
> if test "$echo_cflags" = "yes"; then
>-      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
>+      echo `pkg-config --cflags dvdnav`
> fi
> 
> if test "$echo_minicflags" = "yes"; then
>-      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
>+      echo `pkg-config --cflags dvdnavmini`
> fi
> 
> if test "$echo_libs" = "yes"; then
>-      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
>+      echo `pkg-config --libs dvdnav`
> fi
> 
> if test "$echo_minilibs" = "yes"; then
>-      echo -L$libdir -ldvdnavmini $threadlib
>+      echo `pkg-config --libs dvdnavmini`
> fi

Actions: View | Diff

Attachments on bug 1105762: 903087 | 907325 | 908583 | 908584 | 909712 | 909713 | 909714 | 909715