add patch to fix build on FreeBSD.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 37 insertions, 14 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 1819e590b43c..c075f748e595 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.674 2012/04/18 19:54:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.675 2012/04/21 19:34:03 aballier Exp $
+
+  21 Apr 2012; Alexis Ballier <aballier@gentoo.org> xine-lib-1.2.1-r1.ebuild,
+  +files/xine-lib-1.2.1-freebsd.patch:
+  add patch to fix build on FreeBSD.
 
   18 Apr 2012; Agostino Sarubbo <ago@gentoo.org> xine-lib-1.2.1-r1.ebuild:
   Stable for amd64, wrt bug #412309
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 17d4cc7ce9c0..721743bac1db 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX xine-lib-1.2.1-ffmpeg-git.patch 2314 RMD160 28f004b6e231034b28eed95368668451c29b093c SHA1 179558f72566574e52f3a79231aac25968f18ff0 SHA256 896d2d050a370944b098b82208a41871d11716bc92242b5639e5a9b45cc138a0
 AUX xine-lib-1.2.1-fix_dvb_crc_checking.patch 634 RMD160 d6a54d7db42b21a944968b03738b028179d38888 SHA1 2c788361b1ebf6e643313f1912e574847d719d05 SHA256 6c0695a9ac6fb5b7bfbe6940847ae96f8e9836c55a2a1409e20faba13b6ba465
+AUX xine-lib-1.2.1-freebsd.patch 727 RMD160 98b42d42d298b5376413455e7a81364aced09184 SHA1 70ce386503b9a873d94c4f79f3622a5444c1cc07 SHA256 fb354f40252f0931d022d38d1c391cb55a615f5007a63f55bade30b54fe0e44b
 DIST xine-lib-1.2.1.tar.xz 4843584 RMD160 3cc17c3194797395ea1d696fee1dfa2d8acf1ddf SHA1 ebb2648456504ff4ce08c34de258d3125832bb94 SHA256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e
-EBUILD xine-lib-1.2.1-r1.ebuild 5261 RMD160 92712940f3ce5d60a75ec8332c53f60f7cdf30d9 SHA1 37b942b0bc13b2007e78aae7d255e6a802be6aed SHA256 eccfa77639784607de1cbcc2f429e074ad62246f8b18cc8b900f44f270fedc1c
+EBUILD xine-lib-1.2.1-r1.ebuild 5303 RMD160 2623127f4f923b8151c7026c119051344c0951d2 SHA1 2f6c6fd958cff7ed55b96964f4006349382e06a6 SHA256 082f19ba065310d45f787d1ec0ed8e6111e3134791ee6f9b050b05ef55657f9f
 EBUILD xine-lib-1.2.1.ebuild 5206 RMD160 a92afe8d027f4c1fec4a462844a10fa7689232bf SHA1 debd3e74df0a18471324eaab80022ef769298cd0 SHA256 7e8b77ab2815a8030929b997cfcdf2b7890da966f154c0622c0d1be66416fa8b
 EBUILD xine-lib-1.2.9999.ebuild 5142 RMD160 fe76564d4c83dd2a2ac55e1ff7ad20f526ab6583 SHA1 11a16d5764ed5be2d20168e76e45ffc5dd494bdf SHA256 3bc5a9fdd06442b3ad23154c301735307bc30b1b0d59f0fbe0d20c135b66305c
-MISC ChangeLog 79183 RMD160 905dc5b5b6b3ae6cd09282edd22055073e415d75 SHA1 005a51b55931b8299d3a78b29776b46662a0888d SHA256 810c9f1ce421f1ca914a819252b21ff03fe75ef3932ffa8ffcc406cff9480c9e
+MISC ChangeLog 79343 RMD160 baf8408c3dbfedebbbcc239b0ce5959ffc1e5465 SHA1 441f07a4ed14cf34fa53b0c1ae382247bf355d55 SHA256 2b4f571a3386040c98a99d82c83ee8a108be22aa259f5acf1eadc4959812387f
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPjxveAAoJEOTDgjZ80txdmUcIAIE3wnk+CUMaYJeKnkvHMmar
-ZewocVvUiNddfvWlH6zRuBCUmGU3mJhxDpaT6ypArlKtXIsSGSlGAqqQ9AySifWC
-8iclcE0UMSLsslAEKKCCjC3RNKUlafQxGZ4+tZvGckLKWCgCgMQPOMltP+Dasi7K
-0gf0ICA6Y+0QRJrDD8XJMUrusP/wrJnGRMqwpWI0HnjWxMV08+tGflDWYmyQTByg
-+CkS1XBBvLMNhEMKWC7Ig2VEmPZwGI9lfT5GhfpgwgaOBYcG+SquFPFejz0bs5En
-hm9EgbxsqamN6k8X3ZO3bSWWIaols5d7myqqJr/y8uTJwONj1SMJHtieTaudJ0o=
-=5eWe
+iEYEARECAAYFAk+TC7EACgkQvFcC4BYPU0q7KQCfW7lOS3RspOnvWwEuzE7ByJ8I
+eooAoJ5sjyWQgY6Yp12K2xXhAyhZIGMG
+=MW2N
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-1.2.1-freebsd.patch b/media-libs/xine-lib/files/xine-lib-1.2.1-freebsd.patch
new file mode 100644
index 000000000000..44e1205e323e
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1.2.1-freebsd.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Alexis Ballier <aballier@gentoo.org>
+# Date 1335036489 10800
+# Node ID 6fc56571c45a09d42829624a0d6339f3ad0f6168
+# Parent  3c08d65400c4915891d8b8b18f21c5f0326537b0
+Include arpa/inet.h for htons.
+
+See http://pubs.opengroup.org/onlinepubs/9699919799/functions/htonl.html
+Fixes build on FreeBSD.
+
+diff -r 3c08d65400c4 -r 6fc56571c45a src/audio_dec/xine_lpcm_decoder.c
+--- a/src/audio_dec/xine_lpcm_decoder.c	Thu Apr 19 09:43:05 2012 +0300
++++ b/src/audio_dec/xine_lpcm_decoder.c	Sat Apr 21 16:28:09 2012 -0300
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <arpa/inet.h> /* htons */
+ #include <netinet/in.h> /* ntohs */
+ 
+ #include <xine/xine_internal.h>
diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
index 600b8386674d..ef0dc270da06 100644
--- a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.3 2012/04/18 19:54:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.4 2012/04/21 19:34:03 aballier Exp $
 
 EAPI=4
 
@@ -115,7 +115,8 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) )
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-ffmpeg-git.patch \
-		"${FILESDIR}"/${P}-fix_dvb_crc_checking.patch
+		"${FILESDIR}"/${P}-fix_dvb_crc_checking.patch \
+		"${FILESDIR}"/${P}-freebsd.patch
 
 	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die