Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.21 2015/06/12 10:50:39 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.23 2015/09/06 00:24:46 leot Exp $
|
||||
|
||||
DISTNAME= mpv-0.9.2
|
||||
PKGREVISION= 1
|
||||
DISTNAME= mpv-0.10.0
|
||||
CATEGORIES= multimedia
|
||||
MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
|
||||
GITHUB_TAG= v${PKGVERSION_NOREV}
|
||||
|
||||
MAINTAINER= leot1990@users.sourceforge.net
|
||||
MAINTAINER= leot@NetBSD.org
|
||||
HOMEPAGE= http://mpv.io/
|
||||
COMMENT= Video player based on MPlayer and mplayer2
|
||||
LICENSE= gnu-gpl-v2
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
$NetBSD: distinfo,v 1.14 2015/05/24 08:03:05 adam Exp $
|
||||
$NetBSD: distinfo,v 1.15 2015/09/06 00:24:46 leot Exp $
|
||||
|
||||
SHA1 (mpv-0.9.2.tar.gz) = e5b59d62dee13f8f5cf3974f9c46b7afeb02b740
|
||||
RMD160 (mpv-0.9.2.tar.gz) = bcb626d91875a240a9cfa440c917fc96bed25b7d
|
||||
Size (mpv-0.9.2.tar.gz) = 2701306 bytes
|
||||
SHA1 (patch-audio_chmap.c) = 796442d644fd4b6d0313779f3c6dbbbe598f8ec1
|
||||
SHA1 (mpv-0.10.0.tar.gz) = edc28f8f9ac40f7f273ad20efb8b52ab2bbc0b54
|
||||
RMD160 (mpv-0.10.0.tar.gz) = 5e5b3393a577a124ca4c49217d78c9035d70430c
|
||||
Size (mpv-0.10.0.tar.gz) = 2727566 bytes
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
$NetBSD: patch-audio_chmap.c,v 1.1 2015/05/24 08:03:05 adam Exp $
|
||||
|
||||
Avoid conflict with system popcount64().
|
||||
|
||||
--- audio/chmap.c.orig 2015-05-24 07:59:39.000000000 +0000
|
||||
+++ audio/chmap.c
|
||||
@@ -395,7 +395,7 @@ void mp_chmap_get_reorder(int src[MP_NUM
|
||||
assert(src[n] < 0 || (to->speaker[n] == from->speaker[src[n]]));
|
||||
}
|
||||
|
||||
-static int popcount64(uint64_t bits)
|
||||
+static int mypopcount64(uint64_t bits)
|
||||
{
|
||||
int r = 0;
|
||||
for (int n = 0; n < 64; n++)
|
||||
@@ -408,7 +408,7 @@ int mp_chmap_diffn(const struct mp_chmap
|
||||
{
|
||||
uint64_t a_mask = mp_chmap_to_lavc_unchecked(a);
|
||||
uint64_t b_mask = mp_chmap_to_lavc_unchecked(b);
|
||||
- return popcount64((a_mask ^ b_mask) & a_mask);
|
||||
+ return mypopcount64((a_mask ^ b_mask) & a_mask);
|
||||
}
|
||||
|
||||
// Returns something like "fl-fr-fc". If there's a standard layout in lavc
|
||||
Reference in New Issue
Block a user