[Bug 202404] [MAINTAINER] multimedia/mplayer2: updates to Makefile

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=202404

Jan Beich <jbeich at FreeBSD.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|In Progress                 |Closed

--- Comment #41 from Jan Beich <jbeich at FreeBSD.org> ---
Thanks for patience. Committed. I've fixed the rest myself.

> -.if !defined(PACKAGE_BUILDING)
>  OPTIONS_DEFINE_i386+=	WIN32
>  OPTIONS_DEFAULT_i386+=	WIN32
> -.endif

win32-codecs is a RESTRICTED package thus will make any port that
depends on it broken due to unsatisfied dependency. The check
originates from bug 115170 for mplayer.

_OFF option helper won't trigger if the option isn't defined via
_DEFINE*, _SINGLE, etc. That's why I've moved OPTIONS_DEFINE_i386
outside of PACKAGE_BUILDING in comment 2. Thus package cluster
makes sure to provide --disable-win32dll when building for i386,
the only architecture where configure tries to auto-enable it.

> OPTIONS_DEFAULT=... RTCPU ...

Did you check on either arm*, aarch64, mips*, ia64, sparc64 ?
--enable-runtime-cpudetection is only supported on x86 and ppc
which translates to i386, amd64, powerpc, powerpc64 on FreeBSD.
On other architectures configure calls die() i.e., exits with
error message quoted in comment 37.

> -V4L_LIBS=		-lv4l2
> +V4L_LIBS=		-lv4l1 -lv4l2

libv4l2 usage is inflicted by files/patch-stream-tvi_v4l2.c. Upstream
only uses <linux/videodev2.h> which is part of V4L2 API. Nothing in mplayer2
uses <linux/videodev.h> aka V4L1 API not to mention <libv4l1.h>.

Explain if you think otherwise.

> -.if ${PORT_OPTIONS:MREALPLAYER}
> -RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
> -BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
> -.else
> -CONFIGURE_ARGS+=	--disable-real
> -.endif
> +REALPLAYER_BUILD_DEPENDS=realplay:${PORTSDIR}/multimedia/linux-realplayer
> +REALPLAYER_CONFIGURE_OFF=--disable-real

RUN_DEPENDS are lost in conversion.

> WITH_CDROM_DEVICE?=	/dev/cd0

This is still referenced.

> -.if defined(WITH_KERN_HZ)
> -DEFAULT_KERN_HZ=${WITH_KERN_HZ}
> -.else
> -DEFAULT_KERN_HZ=1024
> -.endif

Did you ignore the build error I reported in comment 37 ?

> -	@${REINPLACE_CMD} -e \
> -		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
> -		${WRKSRC}/mplayer.c
> +		@${REINPLACE_CMD} -e \
> +			's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
> +			${WRKSRC}/mplayer.c

Pointless reindenting causes noise for |svn blame|.

-- 
You are receiving this mail because:
You are the assignee for the bug.