Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Apr 2017 11:20:36 -0400
From:      Michael Butler <imb@protected-networks.net>
To:        freebsd-ports@freebsd.org, Thomas Zander <riggs@freebsd.org>
Subject:   Re: Handbrake fails to build on -current after SVN r437745
Message-ID:  <d0a64451-f45c-a8d0-5270-525090167126@protected-networks.net>
In-Reply-To: <72f824be-313b-b8eb-d748-8eb4f66018d9@protected-networks.net>
References:  <30ac5c73-8d26-0498-832a-9d0e2a4614a7@protected-networks.net> <4d87471d-5088-9bd0-1c12-768ee9c2703f@utanet.at> <72f824be-313b-b8eb-d748-8eb4f66018d9@protected-networks.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On 04/09/17 10:25, Michael Butler wrote:
> On 04/08/17 11:51, Walter Schwarzenfeld wrote:
>> It does compile with poudriere (But not in the port).
> 
> I don't know how .. I get an obvious patch failure ..

> /usr/local/bin/gpatch -t -N -p1 -d ./contrib/libbluray/libbluray-0.9.3/
> < ../contrib/libbluray/A02-expose-clip_id.patch
> patching file src/libbluray/bluray.c
> patching file src/libbluray/bluray.h
> can't find file to patch at input line 40
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |--
> |2.5.5
> |
> |--- Makefile.in.orig   2017-03-25 19:30:14 UTC
> |+++ Makefile.in        2017-03-25 19:30:36 UTC
> --------------------------
> No file to patch.  Skipping patch.
> 1 out of 1 hunk ignored
> gmake[2]: *** [../contrib/libbluray/module.rules:2:
> contrib/libbluray/.stamp.patch] Error 1
> gmake[2]: *** Waiting for unfinished jobs....

The fix is to edit
files/patch-contrib_libbluray_A02-expose-clip__id.patch to read ..

--- contrib/libbluray/A02-expose-clip_id.patch.orig     2017-02-25
20:56:19 UTC
+++ contrib/libbluray/A02-expose-clip_id.patch
@@ -35,3 +35,14 @@ index 3cd7118..177b3d4 100644
 --
 2.5.5

+--- a/Makefile.in.orig 2017-03-25 19:30:14 UTC
++++ b/Makefile.in      2017-03-25 19:30:36 UTC
+@@ -772,7 +772,7 @@
+ MOSTLYCLEANFILES = $(DX_CLEANFILES)
+ @ENABLE_UDF_FALSE@POSIX_C_SOURCE = 200112L
+ @ENABLE_UDF_TRUE@POSIX_C_SOURCE = 200809L
+-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE)
-D_REENTRANT
++SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE)
-D_REENTRANT -D_XOPEN_SOURCE=700
+ SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray
-I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS)
+ AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) \
+       $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d0a64451-f45c-a8d0-5270-525090167126>