diff options
| author | lioux <lioux@FreeBSD.org> | 2003-05-15 12:53:17 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2003-05-15 12:53:17 +0800 |
| commit | db7734354c614ac3fda126bf7ca2331e5d1b998c (patch) | |
| tree | 5e51fd4e1e39c82be7192be71fe225b6adcf1599 /multimedia/mpeg4ip | |
| parent | a11c49fee965ea824ee8a2f6b2e7b43aad7864d4 (diff) | |
| download | freebsd-ports-graphics-db7734354c614ac3fda126bf7ca2331e5d1b998c.tar.gz freebsd-ports-graphics-db7734354c614ac3fda126bf7ca2331e5d1b998c.tar.zst freebsd-ports-graphics-db7734354c614ac3fda126bf7ca2331e5d1b998c.zip | |
o Another try at fixing -CURRENT issues with getopt_long_only()
- Always depend on libgnugetopt port
- Add include/mpeg4ip_getopt.h as a workaround for 5.x
branch native getopt.h implementation
- Futhermore, change regexp regarding PTHREAD_LIBS issue
on -CURRENT. Submitter reports that previous one did not
work but that newer does
PR: 50233
Submitted by: David Yeske <dyeske@yahoo.com>
Diffstat (limited to 'multimedia/mpeg4ip')
| -rw-r--r-- | multimedia/mpeg4ip/Makefile | 11 | ||||
| -rw-r--r-- | multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h | 12 |
2 files changed, 17 insertions, 6 deletions
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index 9fb81534013..8d91f9a4ad4 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -17,9 +17,9 @@ COMMENT= Standards-based system to encode, stream and play MPEG-4 audio/video BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \ nasm:${PORTSDIR}/devel/nasm \ pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 +LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \ + gnugetopt.1:${PORTSDIR}/devel/libgnugetopt -USE_GETOPT_LONG= yes USE_GNOME= gtk20 USE_GMAKE= yes USE_LIBTOOL= yes @@ -29,6 +29,8 @@ CONFIGURE_ARGS= --datadir=${DATADIR} \ --with-glib-prefix=${LOCALBASE} \ --with-gtk-prefix=${X11BASE} \ --program-transform-name='' +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" INSTALLS_SHLIB= yes SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config @@ -110,13 +112,10 @@ post-patch: @${REINPLACE_CMD} -E -e \ 's!SDL_(AudioDelayMsec|HasAudioDelayMsec).*;$$!0;!' \ ${WRKSRC}/player/src/audio_sdl.cpp -# -CURRENT after 500041 has getopt_long # use libgnugetopt -.if ${OSVERSION} < 500041 @${REINPLACE_CMD} -E -e \ 's|(-lm)|\1 -lgnugetopt|' \ ${WRKSRC}/util/iptv/Makefile.in -.endif # do not install manm man pages @${REINPLACE_CMD} -E \ -e 's|api.mpt||' \ @@ -134,7 +133,7 @@ post-configure: # investigated by David Yeske <dyeske@yahoo.com> .if ${OSVERSION} >= 500000 @${REINPLACE_CMD} -E \ - -e 's|(-lSDL)|${PTHREAD_LIBS} \1|' \ + -e 's|(-lSDL-...)|"${PTHREAD_LIBS} \1"|' \ ${WRKSRC}/player/src/Makefile \ ${WRKSRC}/util/yuv/Makefile \ ${WRKSRC}/util/iptv/Makefile diff --git a/multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h b/multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h new file mode 100644 index 00000000000..3677f0259ef --- /dev/null +++ b/multimedia/mpeg4ip/files/patch-include::mpeg4ip_getopt.h @@ -0,0 +1,12 @@ +--- include/mpeg4ip_getopt.h.orig Tue Oct 15 13:12:27 2002 ++++ include/mpeg4ip_getopt.h Mon Feb 24 05:23:50 2003 +@@ -11,6 +11,9 @@ + #endif + + #ifdef HAVE_GETOPT_H ++#ifdef __FreeBSD__ ++#define __GNU_LIBRARY__ ++#endif + #include <getopt.h> + #endif + |