diff options
author | lioux <lioux@FreeBSD.org> | 2003-06-16 09:08:19 +0800 |
---|---|---|
committer | lioux <lioux@FreeBSD.org> | 2003-06-16 09:08:19 +0800 |
commit | 2099de49d667ce024f3c0199ded446c58a3f294e (patch) | |
tree | a80fc69ef301491690f3d53da68fd299d067a6bd /multimedia | |
parent | e0581525b593c9162b3655445cf17bf7d8188c20 (diff) | |
download | freebsd-ports-gnome-2099de49d667ce024f3c0199ded446c58a3f294e.tar.gz freebsd-ports-gnome-2099de49d667ce024f3c0199ded446c58a3f294e.tar.zst freebsd-ports-gnome-2099de49d667ce024f3c0199ded446c58a3f294e.zip |
o Simplify {x,}videosink build fix. Furthermore, this correctly
enables XVideo support in FreeBSD 5.x branch. The reason why
XVideo support was not enabled in FreeBSD 5.x branch is unknown.
o Bump PORTREVISION
Submitted by: Alexander Nedotsukov <bland@mail.ru>
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/gstreamer-plugins/Makefile | 15 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins80/Makefile | 15 |
2 files changed, 6 insertions, 24 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index fbbeb75ca403..cfd2b07cf0b5 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= multimedia audio #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} #MASTER_SITE_SUBDIR= ${PORTNAME} @@ -39,8 +40,8 @@ CONFIGURE_ARGS= --disable-tests \ --disable-v4l CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" + CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_TARGET= PLIST_SUB= \ VERSION="${PORTVERSION:C/..$//}" \ @@ -91,16 +92,6 @@ post-patch: @${REINPLACE_CMD} -E -e \ 's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -# XXX - fix {x,}videosink build - @${REINPLACE_CMD} -E -e \ - 's|^(DEFAULT_INCLUDES.*)$$|\1 \$$\(X_CFLAGS\)|; \ - s|^(XVIDEO_LIBS.*)$$|\1 -lX11 -lXext -lXv -lXxf86vm|' \ - ${WRKSRC}/sys/xvideo/Makefile.in \ - ${WRKSRC}/sys/videosink/Makefile.in - @${REINPLACE_CMD} -E -e \ - 's|@USE_XVIDEO_TRUE@||; \ - s|@USE_XVIDEO_FALSE@|#|' \ - ${WRKSRC}/sys/Makefile.in post-configure: # CC safeness diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index fbbeb75ca403..cfd2b07cf0b5 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= multimedia audio #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} #MASTER_SITE_SUBDIR= ${PORTNAME} @@ -39,8 +40,8 @@ CONFIGURE_ARGS= --disable-tests \ --disable-v4l CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" + CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib" CONFIGURE_TARGET= PLIST_SUB= \ VERSION="${PORTVERSION:C/..$//}" \ @@ -91,16 +92,6 @@ post-patch: @${REINPLACE_CMD} -E -e \ 's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -# XXX - fix {x,}videosink build - @${REINPLACE_CMD} -E -e \ - 's|^(DEFAULT_INCLUDES.*)$$|\1 \$$\(X_CFLAGS\)|; \ - s|^(XVIDEO_LIBS.*)$$|\1 -lX11 -lXext -lXv -lXxf86vm|' \ - ${WRKSRC}/sys/xvideo/Makefile.in \ - ${WRKSRC}/sys/videosink/Makefile.in - @${REINPLACE_CMD} -E -e \ - 's|@USE_XVIDEO_TRUE@||; \ - s|@USE_XVIDEO_FALSE@|#|' \ - ${WRKSRC}/sys/Makefile.in post-configure: # CC safeness |