root
8 years ago
parent
3f456d608d
commit
0b9e5f7565
@ -1,2 +1,3 @@
|
||||
DIST pcre-ocaml-6.2.5.tar.gz 60724 SHA256 f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47 SHA512 9665643165beea8515f22d90a6a0f079108826ec46ce89248c795e982f9b4ddecc0e882a32a9893acac1001d810aad7f3bc7d7b6162ab1260fa4f698c91e04b9 WHIRLPOOL c99da092f8e78de19ea624a021a088b3e19b1accd2b33bc084179f7c1b88e8ac2b51c143321a792067e325568d6ea4c059fc57ac9da477e998cda3936140567c
|
||||
DIST pcre-ocaml-7.1.6.tar.gz 88104 SHA256 7f88d1fb44a394026f20c692170d36f7331cbeea20ca95b841334b8c188efbef SHA512 604bf27324eab3548c8320bee91cd8c8d0c6459aa7c02b576149b6a2beb43ddd9733e7e344c20c100241cabc84be61ef8c4a5515cdd994a7c3105dd3da74782d WHIRLPOOL 25ba4642e4d10300d849993dd5cb18cb9c8216ba17b07756bca866b46460b8cc7399c91cc6390e44250765d40aa81a5ff3c0372bb3ead614c27c9b4a4f3da3d2
|
||||
DIST pcre-ocaml-7.2.2.tar.gz 88275 SHA256 64b2956c638f3428e72c481de766d977a86cab9e7f158bb745469b740f2db786 SHA512 99d8f9fce7d7e05a86dc1c6280dd0718d904ccbfaa0a858a2d97c2cbff94156c39b3875c29032582dafae3b11c01ee13af3896181dad1d8843843d8625721083 WHIRLPOOL eb4e1734478c5037efe72dddd6b8903d8ff29848218808c2ad54bcad1869e8897cf746c65c365f9cb523f36feb70d5191865d255fd5dbc913b13c9f3c7249b23
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
OASIS_BUILD_DOCS=1
|
||||
|
||||
inherit oasis
|
||||
|
||||
DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
|
||||
HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
|
||||
SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/v${PV}/${P}.tar.gz"
|
||||
LICENSE="LGPL-2.1-with-linking-exception"
|
||||
IUSE="examples"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
|
||||
|
||||
RDEPEND=">=dev-libs/libpcre-4.5
|
||||
>=dev-lang/ocaml-4:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
|
||||
|
||||
src_install() {
|
||||
oasis_src_install
|
||||
if use examples ; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,641 @@
|
||||
|
||||
Changes from original commit are only in file paths & quilt refresh.
|
||||
|
||||
commit c31b7d374062f87c7512d9872cbceac920465913
|
||||
Author: Philip Langdale <philipl@overt.org>
|
||||
Date: Mon Sep 21 19:49:36 2015 -0700
|
||||
|
||||
ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master
|
||||
|
||||
The deprecated PixelFormat and PIX_FMT_* names have been removed in
|
||||
ffmpeg master.
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "utils/CPUInfo.h"
|
||||
|
||||
extern "C" {
|
||||
-#include "libswscale/swscale.h"
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavutil/avutil.h"
|
||||
@@ -33,23 +32,6 @@ extern "C" {
|
||||
#include "libpostproc/postprocess.h"
|
||||
}
|
||||
|
||||
-inline int SwScaleCPUFlags()
|
||||
-{
|
||||
- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
|
||||
- int flags = 0;
|
||||
-
|
||||
- if (cpuFeatures & CPU_FEATURE_MMX)
|
||||
- flags |= SWS_CPU_CAPS_MMX;
|
||||
- if (cpuFeatures & CPU_FEATURE_MMX2)
|
||||
- flags |= SWS_CPU_CAPS_MMX2;
|
||||
- if (cpuFeatures & CPU_FEATURE_3DNOW)
|
||||
- flags |= SWS_CPU_CAPS_3DNOW;
|
||||
- if (cpuFeatures & CPU_FEATURE_ALTIVEC)
|
||||
- flags |= SWS_CPU_CAPS_ALTIVEC;
|
||||
-
|
||||
- return flags;
|
||||
-}
|
||||
-
|
||||
inline int PPCPUFlags()
|
||||
{
|
||||
unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
|
||||
@@ -39,7 +39,7 @@ extern "C" {
|
||||
#include "libswscale/swscale.h"
|
||||
}
|
||||
|
||||
-// allocate a new picture (PIX_FMT_YUV420P)
|
||||
+// allocate a new picture (AV_PIX_FMT_YUV420P)
|
||||
DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight)
|
||||
{
|
||||
DVDVideoPicture* pPicture = new DVDVideoPicture;
|
||||
@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert
|
||||
|
||||
int dstformat;
|
||||
if (format == RENDER_FMT_UYVY422)
|
||||
- dstformat = PIX_FMT_UYVY422;
|
||||
+ dstformat = AV_PIX_FMT_UYVY422;
|
||||
else
|
||||
- dstformat = PIX_FMT_YUYV422;
|
||||
+ dstformat = AV_PIX_FMT_YUYV422;
|
||||
|
||||
- struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P,
|
||||
+ struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P,
|
||||
pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat,
|
||||
- SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ SWS_BILINEAR, NULL, NULL, NULL);
|
||||
sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride);
|
||||
sws_freeContext(ctx);
|
||||
}
|
||||
@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur
|
||||
}
|
||||
|
||||
struct EFormatMap {
|
||||
- PixelFormat pix_fmt;
|
||||
+ AVPixelFormat pix_fmt;
|
||||
ERenderFormat format;
|
||||
};
|
||||
|
||||
static const EFormatMap g_format_map[] = {
|
||||
- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P }
|
||||
-, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P }
|
||||
-, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 }
|
||||
-, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 }
|
||||
-, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 }
|
||||
-, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 }
|
||||
-, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI }
|
||||
-, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA }
|
||||
-, { PIX_FMT_NONE , RENDER_FMT_NONE }
|
||||
+ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P }
|
||||
+, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P }
|
||||
+, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 }
|
||||
+, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 }
|
||||
+, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 }
|
||||
+, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 }
|
||||
+, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI }
|
||||
+, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA }
|
||||
+, { AV_PIX_FMT_NONE , RENDER_FMT_NONE }
|
||||
};
|
||||
|
||||
ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt)
|
||||
{
|
||||
- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
|
||||
+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
|
||||
{
|
||||
if(p->pix_fmt == fmt)
|
||||
return p->format;
|
||||
@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro
|
||||
|
||||
int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt)
|
||||
{
|
||||
- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
|
||||
+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
|
||||
{
|
||||
if(p->format == fmt)
|
||||
return p->pix_fmt;
|
||||
}
|
||||
- return PIX_FMT_NONE;
|
||||
+ return AV_PIX_FMT_NONE;
|
||||
}
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
|
||||
@@ -77,8 +77,8 @@ enum DecoderState
|
||||
STATE_SW_MULTI
|
||||
};
|
||||
|
||||
-enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
|
||||
- , const PixelFormat * fmt )
|
||||
+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
|
||||
+ , const AVPixelFormat * fmt )
|
||||
{
|
||||
CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque;
|
||||
|
||||
@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
|
||||
avctx->hwaccel_context = 0;
|
||||
}
|
||||
|
||||
- const PixelFormat * cur = fmt;
|
||||
- while(*cur != PIX_FMT_NONE)
|
||||
+ const AVPixelFormat * cur = fmt;
|
||||
+ while(*cur != AV_PIX_FMT_NONE)
|
||||
{
|
||||
#ifdef HAVE_LIBVDPAU
|
||||
if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))
|
||||
@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
|
||||
#endif
|
||||
#ifdef HAVE_LIBVA
|
||||
// mpeg4 vaapi decoding is disabled
|
||||
- if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
|
||||
+ if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
|
||||
{
|
||||
VAAPI::CDecoder* dec = new VAAPI::CDecoder();
|
||||
if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true)
|
||||
@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre
|
||||
|
||||
for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it)
|
||||
{
|
||||
- m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
|
||||
+ m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
|
||||
if(*it == RENDER_FMT_YUV420P)
|
||||
- m_formats.push_back(PIX_FMT_YUVJ420P);
|
||||
+ m_formats.push_back(AV_PIX_FMT_YUVJ420P);
|
||||
}
|
||||
- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
|
||||
+ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
|
||||
|
||||
pCodec = avcodec_find_decoder(hints.codec);
|
||||
|
||||
@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom
|
||||
pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc;
|
||||
pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace;
|
||||
if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
|
||||
- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P)
|
||||
+ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P)
|
||||
pDvdVideoPicture->color_range = 1;
|
||||
else
|
||||
pDvdVideoPicture->color_range = 0;
|
||||
@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV
|
||||
pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED;
|
||||
pDvdVideoPicture->extended_format = 0;
|
||||
|
||||
- PixelFormat pix_fmt;
|
||||
- pix_fmt = (PixelFormat)m_pFrame->format;
|
||||
+ AVPixelFormat pix_fmt;
|
||||
+ pix_fmt = (AVPixelFormat)m_pFrame->format;
|
||||
|
||||
pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt);
|
||||
return true;
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
public:
|
||||
IHardwareDecoder() {}
|
||||
virtual ~IHardwareDecoder() {};
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0;
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0;
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0;
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0;
|
||||
virtual int Check (AVCodecContext* avctx) = 0;
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
void SetHardware(IHardwareDecoder* hardware);
|
||||
|
||||
protected:
|
||||
- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt);
|
||||
+ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt);
|
||||
|
||||
int FilterOpen(const std::string& filters, bool scale);
|
||||
void FilterClose();
|
||||
@@ -119,7 +119,7 @@ protected:
|
||||
int m_iLastKeyframe;
|
||||
double m_dts;
|
||||
bool m_started;
|
||||
- std::vector<PixelFormat> m_formats;
|
||||
+ std::vector<AVPixelFormat> m_formats;
|
||||
double m_decoderPts;
|
||||
int m_skippedDeint;
|
||||
bool m_requestSkipDeint;
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
|
||||
@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(
|
||||
|
||||
void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture)
|
||||
{
|
||||
- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
|
||||
+ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
|
||||
struct SwsContext *swcontext = sws_getContext(
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422,
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
if (swcontext)
|
||||
{
|
||||
uint8_t *src[] = { yuv422_ptr, 0, 0, 0 };
|
||||
@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42
|
||||
|
||||
void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture)
|
||||
{
|
||||
- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
|
||||
+ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
|
||||
struct SwsContext *swcontext = sws_getContext(
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA,
|
||||
- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
|
||||
+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
if (swcontext)
|
||||
{
|
||||
uint8_t *src[] = { bgra_ptr, 0, 0, 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
|
||||
@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo
|
||||
return true;
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
if (!CheckCompatibility(avctx))
|
||||
return false;
|
||||
@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder()
|
||||
return true;
|
||||
}
|
||||
|
||||
-bool CDecoder::Supports(enum PixelFormat fmt)
|
||||
+bool CDecoder::Supports(enum AVPixelFormat fmt)
|
||||
{
|
||||
- if(fmt == PIX_FMT_DXVA2_VLD)
|
||||
+ if(fmt == AV_PIX_FMT_DXVA2_VLD)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
|
||||
@@ -141,7 +141,7 @@ class CDecoder
|
||||
public:
|
||||
CDecoder();
|
||||
~CDecoder();
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces);
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces);
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual int Check (AVCodecContext* avctx);
|
||||
@@ -154,7 +154,7 @@ public:
|
||||
int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
|
||||
void RelBuffer(uint8_t *data);
|
||||
|
||||
- static bool Supports(enum PixelFormat fmt);
|
||||
+ static bool Supports(enum AVPixelFormat fmt);
|
||||
|
||||
void CloseDXVADecoder();
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
|
||||
@@ -479,7 +479,7 @@ CDecoder::~CDecoder()
|
||||
Close();
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
// don't support broken wrappers by default
|
||||
// nvidia cards with a vaapi to vdpau wrapper
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
|
||||
@@ -406,7 +406,7 @@ public:
|
||||
CDecoder();
|
||||
virtual ~CDecoder();
|
||||
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual void Reset();
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
|
||||
@@ -186,7 +186,7 @@ void CDecoder::Close()
|
||||
m_bitstream = NULL;
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
Close();
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
|
||||
@@ -35,7 +35,7 @@ class CDecoder
|
||||
public:
|
||||
CDecoder();
|
||||
~CDecoder();
|
||||
- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
|
||||
+ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
|
||||
virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual int Check(AVCodecContext* avctx);
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
|
||||
@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_
|
||||
m_vdpauConfig.context = 0;
|
||||
}
|
||||
|
||||
-bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
|
||||
+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
|
||||
{
|
||||
// check if user wants to decode this format with VDPAU
|
||||
std::string gpuvendor = g_Windowing.GetRenderVendor();
|
||||
@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct
|
||||
return 0;
|
||||
}
|
||||
|
||||
-bool CDecoder::IsVDPAUFormat(PixelFormat format)
|
||||
+bool CDecoder::IsVDPAUFormat(AVPixelFormat format)
|
||||
{
|
||||
if (format == AV_PIX_FMT_VDPAU)
|
||||
return true;
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
|
||||
@@ -556,7 +556,7 @@ public:
|
||||
CDecoder();
|
||||
virtual ~CDecoder();
|
||||
|
||||
- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
|
||||
+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
|
||||
virtual int Decode (AVCodecContext* avctx, AVFrame* frame);
|
||||
virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
|
||||
virtual void Reset();
|
||||
@@ -571,7 +571,7 @@ public:
|
||||
bool Supports(VdpVideoMixerFeature feature);
|
||||
bool Supports(EINTERLACEMETHOD method);
|
||||
EINTERLACEMETHOD AutoInterlaceMethod();
|
||||
- static bool IsVDPAUFormat(PixelFormat fmt);
|
||||
+ static bool IsVDPAUFormat(AVPixelFormat fmt);
|
||||
|
||||
static void FFReleaseBuffer(void *opaque, uint8_t *data);
|
||||
static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
|
||||
@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack
|
||||
|
||||
// for video we need a decoder to get desired information into codec context
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata &&
|
||||
- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
|
||||
+ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE))
|
||||
{
|
||||
// open a decoder, it will be cleared down by ffmpeg on closing the stream
|
||||
if (!st->codec->codec)
|
||||
@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
|
||||
st = m_pFormatContext->streams[idx];
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
|
||||
{
|
||||
- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
|
||||
+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
|
||||
return true;
|
||||
hasVideo = true;
|
||||
}
|
||||
@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
|
||||
st = m_pFormatContext->streams[i];
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
|
||||
{
|
||||
- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
|
||||
+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
|
||||
return true;
|
||||
hasVideo = true;
|
||||
}
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
|
||||
@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st
|
||||
|
||||
uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4];
|
||||
struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
|
||||
- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
if (context)
|
||||
{
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
|
||||
@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
|
||||
}
|
||||
else if (m_format == RENDER_FMT_NV12)
|
||||
{
|
||||
- srcFormat = PIX_FMT_NV12;
|
||||
+ srcFormat = AV_PIX_FMT_NV12;
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
src[i] = im->plane[i];
|
||||
@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
|
||||
}
|
||||
else if (m_format == RENDER_FMT_YUYV422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_YUYV422;
|
||||
+ srcFormat = AV_PIX_FMT_YUYV422;
|
||||
src[0] = im->plane[0];
|
||||
srcStride[0] = im->stride[0];
|
||||
}
|
||||
else if (m_format == RENDER_FMT_UYVY422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_UYVY422;
|
||||
+ srcFormat = AV_PIX_FMT_UYVY422;
|
||||
src[0] = im->plane[0];
|
||||
srcStride[0] = im->stride[0];
|
||||
}
|
||||
@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
|
||||
|
||||
m_context = sws_getCachedContext(m_context,
|
||||
im->width, im->height, (AVPixelFormat)srcFormat,
|
||||
- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 };
|
||||
int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
|
||||
@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
|
||||
if (m_format == RENDER_FMT_YUV420P)
|
||||
{
|
||||
- srcFormat = PIX_FMT_YUV420P;
|
||||
+ srcFormat = AV_PIX_FMT_YUV420P;
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
srcTop[i] = im->plane[i];
|
||||
@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
}
|
||||
else if (m_format == RENDER_FMT_NV12)
|
||||
{
|
||||
- srcFormat = PIX_FMT_NV12;
|
||||
+ srcFormat = AV_PIX_FMT_NV12;
|
||||
for (int i = 0; i < 2; i++)
|
||||
{
|
||||
srcTop[i] = im->plane[i];
|
||||
@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
}
|
||||
else if (m_format == RENDER_FMT_YUYV422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_YUYV422;
|
||||
+ srcFormat = AV_PIX_FMT_YUYV422;
|
||||
srcTop[0] = im->plane[0];
|
||||
srcStrideTop[0] = im->stride[0] * 2;
|
||||
srcBot[0] = im->plane[0] + im->stride[0];
|
||||
@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
}
|
||||
else if (m_format == RENDER_FMT_UYVY422)
|
||||
{
|
||||
- srcFormat = PIX_FMT_UYVY422;
|
||||
+ srcFormat = AV_PIX_FMT_UYVY422;
|
||||
srcTop[0] = im->plane[0];
|
||||
srcStrideTop[0] = im->stride[0] * 2;
|
||||
srcBot[0] = im->plane[0] + im->stride[0];
|
||||
@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I
|
||||
|
||||
m_context = sws_getCachedContext(m_context,
|
||||
im->width, im->height >> 1, (AVPixelFormat)srcFormat,
|
||||
- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 };
|
||||
uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 };
|
||||
int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
|
||||
@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu
|
||||
#endif
|
||||
{
|
||||
m_sw_context = sws_getCachedContext(m_sw_context,
|
||||
- im->width, im->height, PIX_FMT_YUV420P,
|
||||
- im->width, im->height, PIX_FMT_RGBA,
|
||||
+ im->width, im->height, AV_PIX_FMT_YUV420P,
|
||||
+ im->width, im->height, AV_PIX_FMT_RGBA,
|
||||
SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
|
||||
@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer()
|
||||
UnInit();
|
||||
}
|
||||
|
||||
-static enum PixelFormat PixelFormatFromFormat(ERenderFormat format)
|
||||
+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format)
|
||||
{
|
||||
- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12;
|
||||
- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P;
|
||||
- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10;
|
||||
- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16;
|
||||
- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12;
|
||||
- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422;
|
||||
- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422;
|
||||
- return PIX_FMT_NONE;
|
||||
+ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12;
|
||||
+ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P;
|
||||
+ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10;
|
||||
+ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16;
|
||||
+ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12;
|
||||
+ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422;
|
||||
+ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422;
|
||||
+ return AV_PIX_FMT_NONE;
|
||||
}
|
||||
|
||||
void CWinRenderer::ManageTextures()
|
||||
@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags)
|
||||
|
||||
void CWinRenderer::RenderSW()
|
||||
{
|
||||
- enum PixelFormat format = PixelFormatFromFormat(m_format);
|
||||
+ enum AVPixelFormat format = PixelFormatFromFormat(m_format);
|
||||
|
||||
// 1. convert yuv to rgb
|
||||
m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx,
|
||||
m_sourceWidth, m_sourceHeight, format,
|
||||
- m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA,
|
||||
- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA,
|
||||
+ SWS_FAST_BILINEAR, NULL, NULL, NULL);
|
||||
|
||||
YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer];
|
||||
|
||||
Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
|
||||
@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi
|
||||
uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch,
|
||||
CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */)
|
||||
{
|
||||
- struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA,
|
||||
- out_width, out_height, PIX_FMT_BGRA,
|
||||
- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL);
|
||||
+ struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA,
|
||||
+ out_width, out_height, AV_PIX_FMT_BGRA,
|
||||
+ CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL);
|
||||
|
||||
uint8_t *src[] = { in_pixels, 0, 0, 0 };
|
||||
int srcStride[] = { (int)in_pitch, 0, 0, 0 };
|
||||
Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
|
||||
===================================================================
|
||||
--- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp
|
||||
+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
|
||||
@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
|
||||
return false;
|
||||
|
||||
// Due to a bug in swsscale we need to allocate one extra line of data
|
||||
- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
|
||||
+ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
|
||||
|
||||
// We got the video frame, render it into the picture buffer
|
||||
struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
|
||||
- m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
|
||||
+ m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
|
||||
|
||||
sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height,
|
||||
m_pFrameRGB->data, m_pFrameRGB->linesize );
|
||||
@ -1 +1 @@
|
||||
Wed, 24 Feb 2016 09:38:26 +0000
|
||||
Wed, 24 Feb 2016 11:38:23 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 24 Feb 2016 09:38:26 +0000
|
||||
Wed, 24 Feb 2016 11:38:23 +0000
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test unpack
|
||||
DEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
|
||||
DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
|
||||
EAPI=5
|
||||
HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
|
||||
IUSE=examples +ocamlopt debug doc
|
||||
KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
|
||||
LICENSE=LGPL-2.1-with-linking-exception
|
||||
RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
|
||||
SLOT=0/7.2.2
|
||||
SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.2/pcre-ocaml-7.2.2.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 9d81603248f2ba3ec59124320d123e5e findlib 9909e5ca0f77ff5b693885a3d7aeadb7 multilib 3972ca401cf7dbb430df9995f5d8d580 oasis dab31007fb098ff15db810bfe5001e64 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=0b6d57fbb10c65704de74a5e3f80b5bd
|
||||
File diff suppressed because one or more lines are too long
@ -1,10 +1,11 @@
|
||||
DEFINED_PHASES=configure install
|
||||
DEFINED_PHASES=compile configure install prepare test
|
||||
DESCRIPTION=DTS Coherent Acoustics decoder with support for HD extensions
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/foo86/dcadec
|
||||
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
|
||||
LICENSE=LGPL-2.1
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/foo86/dcadec/archive/v0.2.0.tar.gz -> dcadec-0.2.0.tar.gz
|
||||
_eclasses_=multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=4dca87eaebd4a69892f0f8f06272432a
|
||||
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
|
||||
_md5_=9c0eb1cf87689ef752dc3a53fc112e44
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=configure install postinst prepare setup
|
||||
DEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils ) caps? ( sys-libs/libcap ) caps-ng? ( sys-libs/libcap-ng ) creds? ( sys-apps/keyutils )
|
||||
DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
|
||||
EAPI=4
|
||||
HOMEPAGE=http://wiki.samba.org/index.php/LinuxCIFS_utils
|
||||
IUSE=ads +caps caps-ng creds
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils ) caps? ( sys-libs/libcap ) caps-ng? ( sys-libs/libcap-ng ) creds? ( sys-apps/keyutils )
|
||||
REQUIRED_USE=^^ ( caps caps-ng )
|
||||
SLOT=0
|
||||
SRC_URI=ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-5.9.tar.bz2
|
||||
_eclasses_=confutils 18995f74ac4ffafb7ad853dfe133f209 eutils 9d81603248f2ba3ec59124320d123e5e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=8af04eeaef5628244ce28a9aeaf87132
|
||||
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=configure install postinst setup
|
||||
DEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 ads? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 ) caps? ( !caps-ng? ( sys-libs/libcap ) ) caps? ( caps-ng? ( sys-libs/libcap-ng ) ) creds? ( sys-apps/keyutils )
|
||||
DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
HOMEPAGE=http://wiki.samba.org/index.php/LinuxCIFS_utils
|
||||
IUSE=+acl +ads +caps +caps-ng creds
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux
|
||||
LICENSE=GPL-3
|
||||
PDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 ads? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 ) caps? ( !caps-ng? ( sys-libs/libcap ) ) caps? ( caps-ng? ( sys-libs/libcap-ng ) ) creds? ( sys-apps/keyutils ) acl? ( || ( =net-fs/samba-3.6*[winbind] >=net-fs/samba-4.0.0_alpha1 ) )
|
||||
REQUIRED_USE=acl? ( ads )
|
||||
SLOT=0
|
||||
SRC_URI=ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.3.tar.bz2
|
||||
SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.5.tar.bz2
|
||||
_eclasses_=eutils 9d81603248f2ba3ec59124320d123e5e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=8eebf34ee4aba67201c64c01f0b4433b
|
||||
_md5_=2cce6c9b0de922ee4e457777ca9f2de3
|
||||
@ -1 +1 @@
|
||||
Wed, 24 Feb 2016 09:38:26 +0000
|
||||
Wed, 24 Feb 2016 11:38:23 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed Feb 24 09:37:36 UTC 2016
|
||||
Wed Feb 24 11:37:33 UTC 2016
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 24 Feb 2016 10:00:01 +0000
|
||||
Wed, 24 Feb 2016 12:00:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
1456306501 Wed 24 Feb 2016 09:35:01 AM UTC
|
||||
1456313701 Wed 24 Feb 2016 11:35:01 AM UTC
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
DIST cifs-utils-5.9.tar.bz2 388403 SHA256 ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2 SHA512 c4d789c6dce2c0927ccc9359147c12151ea9a688bc376c1df21deec66a98669dc4fb6dd8e26d549475d0bbe1e5449ce08fb86e45c765eee7013ec2040c23600e WHIRLPOOL ef4c9b23b2e12a53d936acd19ce10fbe347279ee3c2914a2cbe26d101898bad22606c622ca005af68e0c44605c4137b3633691171387e269caf06542919cec90
|
||||
DIST cifs-utils-6.1.tar.bz2 390958 SHA256 381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5 SHA512 6427b74edbf56b865dee38a610c74ac5483cdc13096082cfc1e9d225a048c9b5ee0c7afb30e625a615a0e8e9f3767e33765220e27148e2c2a29d12d4129b01fd WHIRLPOOL a800a02a0729996035a331b460cb28ae5463ddecaf205d88173dc08efd7a2bee577995ebba97b36977858c8435ac3b7ec9c7ce5d193f8b30d0602f9546fed5b1
|
||||
DIST cifs-utils-6.3.tar.bz2 392465 SHA256 fff73b2a2547628acba05d324cf096e50f13fa8712f01bf0eb0dbabfe268375b SHA512 d1a16d56852d0b7570c795e04b6cee89a678e18401ec4a48bf734e5c941518c70d2cf82e795ce857c9aad07d9dfee68e96524e5d6e1392283cfee0a8b38e185e WHIRLPOOL e983ce227234cbc3141aac96d41a576b3bfb8a7cd0ea85191287d489b595e22e20bc9115a92b803da49931bcb7ac567cd3133b5729105ce99f6ea39c504535a8
|
||||
DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72
|
||||
DIST cifs-utils-6.5.tar.bz2 402158 SHA256 e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7 SHA512 c5eea97d2be455ad676a3ff693641512d5c1d81d75eb1d7d08e4274b6844a1353b6791aa3ced4d8d656ed4a09b3c17ae80f289a90a3d429a8a94210e15f3e90e WHIRLPOOL 880b3c5762e791317140213fea008759b9d2599ddefb08319877ba6a5ced517fd6e0246050975ad01b74110b20f2233bb6cb505ecf3b2e05dca014ae378eaba5
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils confutils linux-info
|
||||
|
||||
DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
|
||||
HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
|
||||
SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
|
||||
IUSE="ads +caps caps-ng creds"
|
||||
|
||||
DEPEND="!net-fs/mount-cifs
|
||||
!<net-fs/samba-3.6_rc1
|
||||
ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
|
||||
caps? ( sys-libs/libcap )
|
||||
caps-ng? ( sys-libs/libcap-ng )
|
||||
creds? ( sys-apps/keyutils )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
REQUIRED_USE="^^ ( caps caps-ng )"
|
||||
|
||||
DOCS="doc/linux-cifs-client-guide.odt"
|
||||
|
||||
pkg_setup() {
|
||||
linux-info_pkg_setup
|
||||
|
||||
confutils_use_conflict caps caps-ng
|
||||
if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
|
||||
ewarn "You must enable CIFS support in your kernel config, "
|
||||
ewarn "to be able to mount samba shares. You can find it at"
|
||||
ewarn
|
||||
ewarn " File systems"
|
||||
ewarn " Network File Systems"
|
||||
ewarn " CIFS support"
|
||||
ewarn
|
||||
ewarn "and recompile your kernel ..."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# bug #459040
|
||||
epatch "${FILESDIR}"/${P}-set-parsed_info-got_user-when-a-cred-file.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
ROOTSBINDIR="${EPREFIX}"/sbin \
|
||||
econf \
|
||||
$(use_enable ads cifsupcall) \
|
||||
$(use_with caps libcap) \
|
||||
$(use_with caps-ng libcap-ng) \
|
||||
$(use_enable creds cifscreds) \
|
||||
--with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \
|
||||
--disable-cifsidmap \
|
||||
--disable-cifsacl
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# remove empty directories
|
||||
find "${ED}" -type d -print0 | xargs --null rmdir \
|
||||
--ignore-fail-on-non-empty &>/dev/null
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Inform about set-user-ID bit of mount.cifs
|
||||
ewarn "setuid use flag was dropped due to multiple security implications"
|
||||
ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
|
||||
ewarn "You are free to set setuid flags by yourself"
|
||||
|
||||
# Inform about upcall usage
|
||||
if use ads ; then
|
||||
ewarn "Using mount.cifs in combination with keyutils"
|
||||
ewarn "in order to mount DFS shares, you need to add"
|
||||
ewarn "the following line to /etc/request-key.conf:"
|
||||
ewarn " create dns_resolver * * /usr/sbin/cifs.upcall %k"
|
||||
ewarn "Otherwise, your DFS shares will not work properly."
|
||||
fi
|
||||
}
|
||||
@ -1,18 +1,18 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
|
||||
inherit eutils linux-info multilib
|
||||
|
||||
DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
|
||||
HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
|
||||
SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
|
||||
SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
|
||||
IUSE="+acl +ads +caps +caps-ng creds"
|
||||
|
||||
DEPEND="!net-fs/mount-cifs
|
||||
@ -1,38 +0,0 @@
|
||||
From 0eb3daa4b17ee64b464594f1a5d413ecb364957c Mon Sep 17 00:00:00 2001
|
||||
From: Jeff Layton <jlayton@samba.org>
|
||||
Date: Thu, 14 Jun 2012 10:59:18 -0400
|
||||
Subject: [PATCH 1/1] mount.cifs: set rc to 0 in libcap toggle_dac_capability
|
||||
|
||||
Thus spake Jochen:
|
||||
|
||||
The mount.cifs program from the cifs-utils package 5.5 did not work on
|
||||
my Linux system. It just exited without an error message and did not
|
||||
mount anything.
|
||||
|
||||
[...]
|
||||
|
||||
I think, when this variable rc is now used in this function, it has also
|
||||
to be properly initialized there.
|
||||
|
||||
Reported-by: Jochen Roderburg <roderburg@uni-koeln.de>
|
||||
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
||||
---
|
||||
mount.cifs.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/mount.cifs.c b/mount.cifs.c
|
||||
index a1b0454..6f3f382 100644
|
||||
--- a/mount.cifs.c
|
||||
+++ b/mount.cifs.c
|
||||
@@ -495,7 +495,7 @@ free_caps:
|
||||
static int
|
||||
toggle_dac_capability(int writable, int enable)
|
||||
{
|
||||
- int rc;
|
||||
+ int rc = 0;
|
||||
cap_t caps;
|
||||
cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
|
||||
|
||||
--
|
||||
1.7.0.4
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
From: Jeff Layton <jlayton@samba.org>
|
||||
Date: Sun, 13 Jan 2013 03:02:01 +0000 (-0500)
|
||||
Subject: mount.cifs: set parsed_info->got_user when a cred file supplies a username
|
||||
X-Git-Url: https://gitweb.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=1a01f7c4b90695211d12291d7a24bec05b1f2922
|
||||
|
||||
mount.cifs: set parsed_info->got_user when a cred file supplies a username
|
||||
|
||||
commit 85d18a1ed introduced a regression when using a credentials file.
|
||||
It set the username in the parsed mount info properly, but didn't set
|
||||
the "got_user" flag in it.
|
||||
|
||||
Also, fix an incorrect strlcpy length specifier in open_cred_file.
|
||||
|
||||
Reported-by: "Mantas M." <grawity@gmail.com>
|
||||
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
||||
---
|
||||
|
||||
diff --git a/mount.cifs.c b/mount.cifs.c
|
||||
index c7c3055..40b77e9 100644
|
||||
--- a/mount.cifs.c
|
||||
+++ b/mount.cifs.c
|
||||
@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
|
||||
switch (parse_cred_line(line_buf + i, &temp_val)) {
|
||||
case CRED_USER:
|
||||
strlcpy(parsed_info->username, temp_val,
|
||||
- sizeof(parsed_info->domain));
|
||||
+ sizeof(parsed_info->username));
|
||||
+ parsed_info->got_user = 1;
|
||||
break;
|
||||
case CRED_PASS:
|
||||
i = set_password(parsed_info, temp_val);
|
||||
Loading…
Reference in new issue