On 2019/08/07 11:32, Brian Callahan wrote:
> Hi Stuart --
>
> On 8/7/19 5:09 AM, Stuart Henderson wrote:
> > On 2019/08/05 07:35, Brian Callahan wrote:
> > > CVSROOT: /cvs
> > > Module name: ports
> > > Changes by: [email protected] 2019/08/05 07:35:20
> > >
> > > Log message:
> > > Import multimedia/handbrake, an open source video transcoder.
> > > ok kn@
> > Handbrake doesn't build on i386 as-is. Either it needs asm disabling,
> > or at least using -msse2 (however there might be further problems),
> > log below.
>
> I'm perfectly ok with requiring -msse2 on i386. Upstream assumes you have
> sse2 (make/include/gcc.defs:77).
>
> > Also there are a few implicit declarations of iconv-related functions
> > which might be a problem on LP64 arches too. this will probably just be
> > a missing #include.
>
> This wasn't a missing #include. It was a stray #define confusing iconv.h.
> Fixed.
>
> The other warnings look like they come from devel/libdvdread. I don't think
> they'll be much of an issue but I guess I'm willing to be proven wrong.
>
> I don't have any i386 machines, so this is untested. The added patch (fixing
> libiconv silliness) is definitely correct; it's the i386 addition of -msse2
> someone will need to check.
Reads ok - can you just commit it please, then it'll get tested in the next
build.
> ~Brian
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/handbrake/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 5 Aug 2019 13:35:20 -0000 1.1.1.1
> +++ Makefile 7 Aug 2019 15:19:13 -0000
> @@ -4,6 +4,7 @@ V = 1.2.2
> COMMENT = open source video transcoder
> DISTNAME = HandBrake-${V}-source
> PKGNAME = handbrake-${V}
> +REVISION = 0
> EXTRACT_SUFX = .tar.bz2
> CATEGORIES = multimedia x11
>
> @@ -69,6 +70,11 @@ MAKE_ENV = AUTOCONF_VERSION="${AUTOCONF_
> MAKE_FILE = GNUmakefile
> MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libxml2
> -D_NO_UPDATE_CHECK" \
> LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lx265
> -liconv"
> +
> +.if ${MACHINE_ARCH:Mi386}
> +CFLAGS += -msse2
> +CXXFLAGS += -msse2
> +.endif
>
> AUTOCONF_VERSION = 2.69
> AUTOMAKE_VERSION = 1.16
> Index: patches/patch-make_variant_freebsd_defs
> ===================================================================
> RCS file: patches/patch-make_variant_freebsd_defs
> diff -N patches/patch-make_variant_freebsd_defs
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-make_variant_freebsd_defs 7 Aug 2019 15:19:13 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: make/variant/freebsd.defs
> +--- make/variant/freebsd.defs.orig
> ++++ make/variant/freebsd.defs
> +@@ -3,8 +3,6 @@ LOCALBASE ?= /usr/local
> +
> + TARGET.dylib.ext = .so
> +
> +-GCC.D = LIBICONV_PLUG
> +-
> + GCC.args.dylib = -shared
> + GCC.args.pic = 1
> +
