[vlc-commits] Contribs: update to libdvbpsi 0.2.1

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Sep 19 00:59:50 2011 +0200| [bcd480400931d4cdcb53cfcbf43fe1ec884a20f4] | committer: Jean-Baptiste Kempf

Contribs: update to libdvbpsi 0.2.1

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bcd480400931d4cdcb53cfcbf43fe1ec884a20f4
---

 contrib/src/dvbpsi/SHA512SUMS              |    2 +-
 contrib/src/dvbpsi/libdvbpsi-example.patch |   12 ------------
 contrib/src/dvbpsi/rules.mak               |    3 +--
 extras/contrib/src/packages.mak            |    2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/contrib/src/dvbpsi/SHA512SUMS b/contrib/src/dvbpsi/SHA512SUMS
index 63d02c0..979d113 100644
--- a/contrib/src/dvbpsi/SHA512SUMS
+++ b/contrib/src/dvbpsi/SHA512SUMS
@@ -1 +1 @@
-c04f38631a3b9d5ff394afd51bf3370c46a8ffb31b37184784cf45c7f3dfa128a2bb8f114480068c16d03e8cd685739e5ab87eeb5c08c56b80f1483021b2c2d5  libdvbpsi-0.2.0.tar.bz2
+93ec2881ffd15bbcb723746717ea73afca74b6dcbb3a2db3d8a98fdcc92be7b9508cd813d8bf22b899c99e7246e495df4108ab2b7ac9d33605bcf9e361826366  libdvbpsi-0.2.1.tar.bz2
diff --git a/contrib/src/dvbpsi/libdvbpsi-example.patch b/contrib/src/dvbpsi/libdvbpsi-example.patch
deleted file mode 100644
index 1b884d0..0000000
--- a/contrib/src/dvbpsi/libdvbpsi-example.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libdvbpsi/examples/decode_mpeg.c	2010-02-12 11:17:47.000000000 +0100
-+++ libdvbpsi.new/examples/decode_mpeg.c	2011-04-29 02:21:40.758841339 +0200
-@@ -529,8 +529,8 @@
- 
-     int i_fd = -1;
-     int i_mtu = 1316; /* (7 * 188) = 1316 < 1500 network MTU */
--#ifdef HAVE_SYS_SOCKET_H
-     int i_report = REPORT_UDP; /* REPORT_PCR REPORT_UDP */
-+#ifdef HAVE_SYS_SOCKET_H
-     int i_port = 0;
-     char *ipaddress = NULL;
- #endif
diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index c63d647..7adfce6 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -1,6 +1,6 @@
 # dvbpsi
 
-DVBPSI_VERSION := 0.2.0
+DVBPSI_VERSION := 0.2.1
 DVBPSI_URL := $(VIDEOLAN)/libdvbpsi/$(DVBPSI_VERSION)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2
 
 PKGS += dvbpsi
@@ -15,7 +15,6 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
 
 libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
 	$(UNPACK)
-	$(APPLY) $(SRC)/dvbpsi/libdvbpsi-example.patch
 	$(MOVE)
 
 .dvbpsi: libdvbpsi
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index ed6ed34..78b1cc2 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -105,7 +105,7 @@ LIBDVDREAD_SVN_REV=1218
 LIBDVDREAD_VERSION=0.9.7
 LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 #LIBDVDREAD_URL=$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
-LIBDVBPSI_VERSION=0.2.0
+LIBDVBPSI_VERSION=0.2.1
 LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz