From owner-svn-ports-all@FreeBSD.ORG Sat Apr 11 19:31:24 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81849168; Sat, 11 Apr 2015 19:31:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CAF9C6D; Sat, 11 Apr 2015 19:31:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3BJVO8p089638; Sat, 11 Apr 2015 19:31:24 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3BJVNB2089633; Sat, 11 Apr 2015 19:31:23 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <201504111931.t3BJVNB2089633@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Sat, 11 Apr 2015 19:31:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383825 - in head/audio/xmms-faad: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2015 19:31:24 -0000 Author: naddy Date: Sat Apr 11 19:31:22 2015 New Revision: 383825 URL: https://svnweb.freebsd.org/changeset/ports/383825 Log: Clean up historic entanglements with other ports: * Merge Makefile and Makefile.inc. * Add our own proper pkg-descr file. * Remove support for building a BMP plugin. Added: head/audio/xmms-faad/pkg-descr - copied, changed from r383803, head/audio/faad/pkg-descr Deleted: head/audio/xmms-faad/Makefile.inc Modified: head/audio/xmms-faad/Makefile head/audio/xmms-faad/files/patch-mp4_utils.c Modified: head/audio/xmms-faad/Makefile ============================================================================== --- head/audio/xmms-faad/Makefile Sat Apr 11 18:13:14 2015 (r383824) +++ head/audio/xmms-faad/Makefile Sat Apr 11 19:31:22 2015 (r383825) @@ -1,11 +1,39 @@ # Created by: David Yeske # $FreeBSD$ +PORTNAME= faad2 +PORTVERSION= 2.7 +PORTREVISION= 5 +CATEGORIES= audio +MASTER_SITES= SF/faac/${PORTNAME}-src/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= xmms- MAINTAINER= naddy@FreeBSD.org -COMMENT= XMMS plugin for faad +COMMENT= XMMS plugin for MP4/M4A/AAC files -MASTERDIR= ${.CURDIR} +LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms \ + libfaad.so:${PORTSDIR}/audio/faad -.include "${MASTERDIR}/Makefile.inc" +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/plugins/xmms/src + +USE_GNOME= gtk12 +USES= pkgconfig tar:bzip2 +WANT_GNOME= yes +EXTRA_CFLAGS= `xmms-config --cflags` +EXTRA_LDFLAGS= `xmms-config --libs` + +PLUGINS_DIR= ${PREFIX}/lib/xmms/Input +PLIST_FILES= ${PLUGINS_DIR:S,^${PREFIX}/,,}/libmp4.so + +do-build: + cd ${WRKSRC} && ${CC} ${CFLAGS} -fPIC -shared \ + -I${LOCALBASE}/include -DHAVE_STDINT_H \ + ${EXTRA_CFLAGS} *.c -o libmp4.so \ + -L${LOCALBASE}/lib -lfaad -lmp4ff \ + ${EXTRA_LDFLAGS} + +do-install: + @${MKDIR} ${STAGEDIR}${PLUGINS_DIR} + cd ${WRKSRC}; ${INSTALL_LIB} libmp4.so ${STAGEDIR}${PLUGINS_DIR} + +.include Modified: head/audio/xmms-faad/files/patch-mp4_utils.c ============================================================================== --- head/audio/xmms-faad/files/patch-mp4_utils.c Sat Apr 11 18:13:14 2015 (r383824) +++ head/audio/xmms-faad/files/patch-mp4_utils.c Sat Apr 11 19:31:22 2015 (r383825) @@ -1,6 +1,6 @@ ---- mp4_utils.c.orig 2004-10-18 05:44:51.000000000 +0900 -+++ mp4_utils.c 2009-02-12 02:53:15.000000000 +0900 -@@ -3,15 +3,22 @@ +--- mp4_utils.c.orig 2004-10-17 20:44:51 UTC ++++ mp4_utils.c +@@ -3,7 +3,7 @@ */ #include "mp4ff.h" @@ -9,18 +9,3 @@ #include #include - #include - #include -+ -+#if defined(HAVE_BMP) -+#include -+#include -+#include -+#else - #include - #include - #include -+#endif /*HAVE_BMP*/ - - const char *mp4AudioNames[]= - { Copied and modified: head/audio/xmms-faad/pkg-descr (from r383803, head/audio/faad/pkg-descr) ============================================================================== --- head/audio/faad/pkg-descr Sat Apr 11 14:22:35 2015 (r383803, copy source) +++ head/audio/xmms-faad/pkg-descr Sat Apr 11 19:31:22 2015 (r383825) @@ -1,7 +1,9 @@ -FAAD2 (Freeware Advanced Audio Decoder) is a MPEG-2, MPEG-4 AAC decoder. +FAAD2 (Freeware Advanced Audio Decoder) is an MPEG-2, MPEG-4 AAC decoder. FAAD2 is the fastest ISO AAC audio decoder available and can be used with DRM (Digital Radio Mondiale), and supports HE (High Efficiency), Main, LC, LD, LTP, PS (Parametric Stereo) AAC files. +This is an XMMS plugin for playing MPEG-4 AAC files. + WWW: http://www.audiocoding.com/