Date: Sun, 18 Jan 2015 17:00:48 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377337 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201501181700.t0IH0m9P034403@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Jan 18 17:00:48 2015 New Revision: 377337 URL: https://svnweb.freebsd.org/changeset/ports/377337 QAT: https://qat.redports.org/buildarchive/r377337/ Log: Modernise compiler handling - Retire OTCHAIN OPTION - Retire support for gcc 4.2 from base - Depend on c11 compliant compiler via USES=compiler:c11 - Respect CC,CXX,CPP from environment (fixes bug 196811) - Bump PORTREVISION (default package on 8.x changes) Deleted: head/multimedia/mplayer/files/extra-patch-base_system_gcc Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.options head/multimedia/mplayer/Makefile.shared Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Jan 18 16:55:56 2015 (r377336) +++ head/multimedia/mencoder/Makefile Sun Jan 18 17:00:48 2015 (r377337) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Convenient video file and movie encoder @@ -12,7 +12,7 @@ COMMENT= Convenient video file and movie OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG \ DV FAAC FONTCONFIG FRIBIDI GIF GNUTLS GSM IPV6 JACK \ LADSPA LIBMNG LZO MAD NAS OCFLAGS OPENAL \ - OPENJPEG OPUS OTCHAIN PULSEAUDIO REAL RTCPU RTMP \ + OPENJPEG OPUS PULSEAUDIO REAL RTCPU RTMP \ SCHROEDINGER SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU WIN32 X264 XVID @@ -20,7 +20,6 @@ OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS BLURAY_DESC?= BluRay support LZO_DESC?= Enable external liblzo library OCFLAGS_DESC?= Use optimized compiler flags -OTCHAIN_DESC?= Use up-to-date gcc toolchain on legacy systems REAL_DESC?= Enable realplayer plugin RTCPU_DESC?= Use runtime CPU detection on supported archs WIN32_DESC?= Install win32 binary codecs Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Jan 18 16:55:56 2015 (r377336) +++ head/multimedia/mplayer/Makefile Sun Jan 18 17:00:48 2015 (r377337) @@ -3,6 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= High performance media player supporting many formats @@ -11,7 +12,7 @@ COMMENT= High performance media player s OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \ - OPENJPEG OPUS OTCHAIN PULSEAUDIO REAL RTC RTCPU RTMP \ + OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \ SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \ WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC @@ -25,7 +26,6 @@ BLURAY_DESC?= BluRay support ENCA_DESC?= Charset conversion via enca LZO_DESC?= External liblzo support OCFLAGS_DESC?= Use optimized compiler flags -OTCHAIN_DESC?= Use up-to-date gcc toolchain on legacy systems REAL_DESC?= Enable realplayer plugin RTC_DESC?= Add support for kernel real time clock RTCPU_DESC?= Use runtime CPU detection on supported archs Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Sun Jan 18 16:55:56 2015 (r377336) +++ head/multimedia/mplayer/Makefile.options Sun Jan 18 17:00:48 2015 (r377337) @@ -84,11 +84,6 @@ CONFIGURE_ARGS+= --disable-tv-v4l1 \ # Build system handling (including OPTIONS) # ========================================= -# Supported architectures for clang -.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "armv6" -MPLAYER_CLANG_SUPPORTED_ARCH= yes -.endif - # Supported architectures for runtime CPU detection .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ppc" MPLAYER_RTCPU_SUPPORTED_ARCH= yes @@ -109,37 +104,14 @@ BROKEN= Does not compile on sparc64 CONFIGURE_ARGS+=--enable-runtime-cpudetection .endif -.if ${OSVERSION} >= 900033 \ - && exists(/usr/bin/clang) \ - && defined(MPLAYER_CLANG_SUPPORTED_ARCH) -WITH_BASE_CLANG=yes -.endif - -.if defined(WITH_BASE_CLANG) -CC= clang -CXX= clang++ -CPP= clang-cpp +.if ${CHOSEN_COMPILER_TYPE} == clang EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version # Require 16 byte stack realignment on i386 to interface # properly with hand crafted assembler code in ffmpeg .if ${ARCH} == "i386" CFLAGS+= -mstack-alignment=16 -mstackrealign .endif # ${ARCH} == "i386" -.else -.if ${PORT_OPTIONS:MOTCHAIN} -USE_GCC?= yes -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -.else -CONFIGURE_ARGS+=--disable-ssse3 --disable-sse4 --disable-sse42 \ - --disable-avx --disable-fast-cmov -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_gcc -.if ${ARCH} == "amd64" -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif # ${ARCH} == "amd64" -.endif # ${PORT_OPTIONS:MOTCHAIN} -.endif # defined(WITH_BASE_CLANG) +.endif # ${CHOSEN_COMPILER_TYPE} == clang .if ${ARCH} == "armv6" CFLAGS_armv6+= -no-integrated-as Modified: head/multimedia/mplayer/Makefile.shared ============================================================================== --- head/multimedia/mplayer/Makefile.shared Sun Jan 18 16:55:56 2015 (r377336) +++ head/multimedia/mplayer/Makefile.shared Sun Jan 18 17:00:48 2015 (r377337) @@ -22,7 +22,7 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graph BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm -USES= gmake iconv ncurses tar:xz +USES= compiler:c11 gmake iconv ncurses tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501181700.t0IH0m9P034403>