diff --git a/common/shlibs b/common/shlibs index 948bfa351ae..fd98773bc4f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -406,7 +406,7 @@ libmatroska.so.6 libmatroska-1.4.1_5 libebml.so.4 libebml-1.3.0_5 libdvdread.so.4 libdvdread-4.1.3_1 libdvdnav.so.4 libdvdnav-4.1.3_1 -libdvbpsi.so.9 libdvbpsi-1.1.2_1 +libdvbpsi.so.10 libdvbpsi-1.3.1_1 libdca.so.0 libdca-0.0.5_1 libmpeg2.so.0 libmpeg2-0.5.1_1 libmpeg2convert.so.0 libmpeg2-0.5.1_1 diff --git a/srcpkgs/libdvbpsi/patches/fix-includes.patch b/srcpkgs/libdvbpsi/patches/fix-includes.patch deleted file mode 100644 index 32a1698a0ba..00000000000 --- a/srcpkgs/libdvbpsi/patches/fix-includes.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- examples/dvbinfo/buffer.h -+++ examples/dvbinfo/buffer.h -@@ -23,6 +23,9 @@ - #ifndef DVBINFO_BUFFER_H_ - #define DVBINFO_BUFFER_H_ - -+#include -+#include -+ - typedef struct buffer_s buffer_t; - - struct buffer_s ---- src/descriptor.h -+++ src/descriptor.h -@@ -35,6 +35,9 @@ - #ifndef _DVBPSI_DESCRIPTOR_H_ - #define _DVBPSI_DESCRIPTOR_H_ - -+#include -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/srcpkgs/libdvbpsi/patches/fix-test_dr_boolean.patch b/srcpkgs/libdvbpsi/patches/fix-test_dr_boolean.patch deleted file mode 100644 index 2d757115bdf..00000000000 --- a/srcpkgs/libdvbpsi/patches/fix-test_dr_boolean.patch +++ /dev/null @@ -1,23 +0,0 @@ -This uncommon way to use a boolean is not supported by gcc6. -Instead of incrementing by 12 (huh?) just toggle between -false and true. - ---- misc/test_dr.h 2013-11-10 13:13:35.000000000 +0100 -+++ misc/test_dr.h 2016-09-12 04:52:08.334029901 +0200 -@@ -93,13 +93,13 @@ - { \ - fprintf(stdout, " \"%s\" boolean check\n", #name); \ - i_loop_count = 0; \ -- s_decoded.name = 0; \ -+ s_decoded.name = false; \ - do \ - { - - #define BOZO_end_boolean(name) \ -- s_decoded.name += 12; \ -- } while(!i_err && (s_decoded.name <= 12)); \ -+ s_decoded.name = !s_decoded.name; \ -+ } while(!i_err && s_decoded.name); \ - fprintf(stdout, "\r iteration count: %22llu", i_loop_count); \ - if(i_err) \ - fprintf(stdout, " FAILED !!!\n"); \ diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template index 5c84665cb8d..554d84499db 100644 --- a/srcpkgs/libdvbpsi/template +++ b/srcpkgs/libdvbpsi/template @@ -1,23 +1,17 @@ # Template file for 'libdvbpsi' pkgname=libdvbpsi -version=1.1.2 -revision=4 +version=1.3.1 +revision=1 build_style=gnu-configure short_desc="PSI decoder and generator library for MPEG2 and DVB streams" -homepage="http://www.videolan.org/developers/libdvbpsi.html" +homepage="https://www.videolan.org/developers/libdvbpsi.html" license="LGPL-2.1" maintainer="Juan RP " -distfiles="http://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2" -checksum=22436366beaa1bff27b3f6d80e43de1012b16d3b63b1e22d37d4a6fcb5db8933 - -CFLAGS="-Wno-error=cast-qual" -if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Disable error for gcc6 warning -Wmisleading-indentation - CFLAGS+=" -Wno-error=misleading-indentation" -fi +distfiles="https://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2" +checksum=d68367afd5ad8e6ebca813e7958a3ceb9743b421adb4265eceeb6a3511c84420 libdvbpsi-devel_package() { - depends="libdvbpsi>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include