diff options
Diffstat (limited to 'community/guvcview')
| -rw-r--r-- | community/guvcview/APKBUILD | 18 | ||||
| -rw-r--r-- | community/guvcview/configure-cppflags.patch | 11 | ||||
| -rw-r--r-- | community/guvcview/ffmpeg-3.patch | 26 |
3 files changed, 35 insertions, 20 deletions
diff --git a/community/guvcview/APKBUILD b/community/guvcview/APKBUILD index 5ec9ece346..cea6787d73 100644 --- a/community/guvcview/APKBUILD +++ b/community/guvcview/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=guvcview -pkgver=2.0.1 -pkgrel=1 +pkgver=2.0.3 +pkgrel=0 pkgdesc="Webcam viewer" url="http://guvcview.sourceforge.net/" arch="all" @@ -15,7 +15,7 @@ install= subpackages="$pkgname-doc $pkgname-lang" source="http://downloads.sourceforge.net/project/guvcview/source/guvcview-src-$pkgver.tar.gz 0001-fix-building-with-musl-libc.patch - configure-cppflags.patch + ffmpeg-3.patch " _builddir="$srcdir"/guvcview-src-$pkgver @@ -46,12 +46,12 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="54e608b8a2c13d96f546197117d758f4 guvcview-src-2.0.1.tar.gz +md5sums="994d1d08a013356de516771818774947 guvcview-src-2.0.3.tar.gz 6d30ec659cd71d34c2d30225e730cff8 0001-fix-building-with-musl-libc.patch -a9ca747ba7b29eb77753c980eeca18d1 configure-cppflags.patch" -sha256sums="dffb86c01bd2e25216d9fbc0c246342246818036d9f63e0488111d757d9b018d guvcview-src-2.0.1.tar.gz +9dc6bf4619686d39417d3f5faf08ca99 ffmpeg-3.patch" +sha256sums="1f2c79f2dccbf512a0aa1c397ce8e5d37fb0a48008ef72a0d3f10f9dc0758bce guvcview-src-2.0.3.tar.gz a65de3103875251cba9cf9cac5399cbd6fb5a58e550a4f3573f72660e1cec454 0001-fix-building-with-musl-libc.patch -8c0cc2256cf4c84b9b74eef3c3fc324324999587ea9df8ebc6377d0036e5040e configure-cppflags.patch" -sha512sums="b3877f00f4caf224eac2010f62e1c3d575b94f84cd0a8da7a5f1df6c851384c7a9e356de905ce27e143dc9761137ae1cce146bb4f6c0aa6d270dd53551bce67a guvcview-src-2.0.1.tar.gz +1f9cc00ca6c18b3b5a7abe03b35a9c2130104cdc2c3ae73dfb8cefced7d1dca9 ffmpeg-3.patch" +sha512sums="976e62ffe26bd9c815ff754337a42512c6fcc9d55285e79e0505f6211a7ca2407546e433fc0e8439ea541ef51a23101b0badda2f9fcc9d197d3a2ab27983b704 guvcview-src-2.0.3.tar.gz 9ab9575bc41acc79581da8d43ef52fc9cf2bf46ef7df97951202e47f5516c38b42ebb715a4e8d6010ac9875c2c9c8cb1912d39282d4a632123424ab516632c98 0001-fix-building-with-musl-libc.patch -1c97bfba867518ca99606f38a0450389ae01516ecfcd8339f907b01a981f3f2c2b34cac5b264fa2bf7827c29a93a52818f099260f787e42ce19eca150c5cf971 configure-cppflags.patch" +793c0057cc3d5cb63333165696a2dbf1d992ecd33541bde186a31bba9eb493609ab8ee186764189a5c753e824810240b182a54aa6b65a42dde400f7192bbce14 ffmpeg-3.patch" diff --git a/community/guvcview/configure-cppflags.patch b/community/guvcview/configure-cppflags.patch deleted file mode 100644 index 4931463d93..0000000000 --- a/community/guvcview/configure-cppflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.orig -+++ ./configure -@@ -13902,7 +13902,7 @@ - fi - - --CPPFLAGS+="${GVIEWV4L2CORE_CFLAGS}" -+CPPFLAGS="$CPPFLAGS ${GVIEWV4L2CORE_CFLAGS}" - for ac_header in avcodec.h libavcodec/avcodec.h ffmpeg/avcodec.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/community/guvcview/ffmpeg-3.patch b/community/guvcview/ffmpeg-3.patch new file mode 100644 index 0000000000..7bdc7432c7 --- /dev/null +++ b/community/guvcview/ffmpeg-3.patch @@ -0,0 +1,26 @@ +diff --git a/gview_v4l2core/jpeg_decoder.c b/gview_v4l2core/jpeg_decoder.c +index 0f3fc7a..0312a97 100644 +--- a/gview_v4l2core/jpeg_decoder.c ++++ b/gview_v4l2core/jpeg_decoder.c +@@ -1436,7 +1436,7 @@ int jpeg_init_decoder(int width, int height) + exit(-1); + } + +- codec_data->context->pix_fmt = PIX_FMT_YUV422P; ++ codec_data->context->pix_fmt = AV_PIX_FMT_YUV422P; + codec_data->context->width = width; + codec_data->context->height = height; + //jpeg_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE); +diff --git a/gview_v4l2core/uvc_h264.c b/gview_v4l2core/uvc_h264.c +index 309b963..58cb230 100644 +--- a/gview_v4l2core/uvc_h264.c ++++ b/gview_v4l2core/uvc_h264.c +@@ -970,7 +970,7 @@ int h264_init_decoder(int width, int height) + } + + h264_ctx->context->flags2 |= CODEC_FLAG2_FAST; +- h264_ctx->context->pix_fmt = PIX_FMT_YUV420P; ++ h264_ctx->context->pix_fmt = AV_PIX_FMT_YUV420P; + h264_ctx->context->width = width; + h264_ctx->context->height = height; + //h264_ctx->context->dsp_mask = (FF_MM_MMX | FF_MM_MMXEXT | FF_MM_SSE); |