diff options
| author | wiz <wiz@pkgsrc.org> | 2010-09-16 09:49:42 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-09-16 09:49:42 +0000 |
| commit | 224231f2dbd3a93321e6c5b0cc7fb7889f6f13b0 (patch) | |
| tree | b5adf4feec2a3ff46e5941fdebd7096445be8bf9 /x11 | |
| parent | 7112eedd942969f8ac28d455038fcfdf06f50a0d (diff) | |
| download | pkgsrc-224231f2dbd3a93321e6c5b0cc7fb7889f6f13b0.tar.gz | |
Now that libX11 pulls in libxcb, merge xine-xcb package back into
xine-lib.
Update dependency patterns in users and bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Makefile | 3 | ||||
| -rw-r--r-- | x11/xine-xcb/DESCR | 7 | ||||
| -rw-r--r-- | x11/xine-xcb/Makefile | 29 | ||||
| -rw-r--r-- | x11/xine-xcb/PLIST | 3 |
4 files changed, 1 insertions, 41 deletions
diff --git a/x11/Makefile b/x11/Makefile index f3901d1a9b1..7511e400786 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.621 2010/09/08 11:59:03 obache Exp $ +# $NetBSD: Makefile,v 1.622 2010/09/16 09:49:42 wiz Exp $ # COMMENT= Packages to support the X window system @@ -477,7 +477,6 @@ SUBDIR+= xglobe SUBDIR+= xgrk SUBDIR+= xhangglider SUBDIR+= xhost -SUBDIR+= xine-xcb SUBDIR+= xineramaproto SUBDIR+= xinit SUBDIR+= xinput diff --git a/x11/xine-xcb/DESCR b/x11/xine-xcb/DESCR deleted file mode 100644 index c831f005775..00000000000 --- a/x11/xine-xcb/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -Xine is a free multimedia player library for playing back CDs, DVDs, -and VCDs. It also decodes multimedia files like AVI, MOV, WMV, and MP3 -from local disk drives, and displays multimedia streamed over the -Internet. It interprets many of the most common multimedia formats -available -- and some of the most uncommon formats, too. - -This package provides the XCB video output plugins for xine-lib. diff --git a/x11/xine-xcb/Makefile b/x11/xine-xcb/Makefile deleted file mode 100644 index 6a04b6249b6..00000000000 --- a/x11/xine-xcb/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2009/08/29 13:06:34 wiz Exp $ -# - -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../multimedia/xine-lib/Makefile.common" - -PKGNAME= ${XINE_PKGNAME:S/lib/xcb/} -CATEGORIES= multimedia -COMMENT= The XCB video output plugins for xine-lib - -DEPENDS+= xine-lib>=1rc3a:../../multimedia/xine-lib - -BUILD_DIRS= ${WRKSRC}/src/video_out -CONFIGURE_ARGS+= --with-xcb -CONFIGURE_ARGS+= --without-x - -INSTALLATION_DIRS= lib/xine/plugins/${XINE_MOD_DIR_VER} - -do-install: - cd ${WRKSRC}/src/video_out && \ - ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - xineplug_vo_out_xcbshm.la ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} - cd ${WRKSRC}/src/video_out && \ - ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - xineplug_vo_out_xcbxv.la ${DESTDIR}${PREFIX}/lib/xine/plugins/${XINE_MOD_DIR_VER} - -.include "../../x11/libxcb/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xine-xcb/PLIST b/x11/xine-xcb/PLIST deleted file mode 100644 index c27d16a2b21..00000000000 --- a/x11/xine-xcb/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/04/06 11:37:13 drochner Exp $ -lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbshm.la -lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_xcbxv.la |