r1141 - in /experimental/libmpc/debian: changelog patches/03_crc32-internal.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Apr 19 21:12:36 2008
New Revision: 1141

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1141
Log:
debian/patches/03_crc32-internal.patch:
+ Rename crc32() to _mpc_crc32() to avoid conflicts with other libraries
like zlib for example.

Added:
    experimental/libmpc/debian/patches/03_crc32-internal.patch
Modified:
    experimental/libmpc/debian/changelog

Modified: experimental/libmpc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libmpc/debian/changelog?rev=1141&op=diff
==============================================================================
--- experimental/libmpc/debian/changelog (original)
+++ experimental/libmpc/debian/changelog Sat Apr 19 21:12:36 2008
@@ -1,11 +1,13 @@
-libmpc (1:0.1~r394-2) UNRELEASED; urgency=low
+libmpc (1:0.1~r394-2) experimental; urgency=low
 
-  * NOT RELEASED YET
   * debian/control:
     + Wrap control fields.
     + Update maintainer to pkg-multimedia.
+  * debian/patches/03_crc32-internal.patch:
+    + Rename crc32() to _mpc_crc32() to avoid conflicts with other libraries
+      like zlib for example.
 
- -- Sebastian Dröge <slomo at debian.org>  Wed, 16 Apr 2008 10:59:04 +0200
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 19 Apr 2008 23:11:33 +0200
 
 libmpc (1:0.1~r394-1) experimental; urgency=high
 

Added: experimental/libmpc/debian/patches/03_crc32-internal.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/libmpc/debian/patches/03_crc32-internal.patch?rev=1141&op=file
==============================================================================
--- experimental/libmpc/debian/patches/03_crc32-internal.patch (added)
+++ experimental/libmpc/debian/patches/03_crc32-internal.patch Sat Apr 19 21:12:36 2008
@@ -1,0 +1,64 @@
+--- libmpc-0.1~r394.old/common/crc32.c	2006-11-14 17:54:22.000000000 +0100
++++ libmpc-0.1~r394/common/crc32.c	2008-04-19 22:39:02.000000000 +0200
+@@ -50,6 +50,7 @@
+ }
+ 
+ /* Return the CRC of the bytes buf[0..len-1]. */
++__attribute__((visibility("hidden")))
+ unsigned long crc32(unsigned char *buf, int len)
+ {
+ 	return update_crc(0xffffffffL, buf, len) ^ 0xffffffffL;
+diff -Naur libmpc-0.1~r394.old/common/crc32.c libmpc-0.1~r394/common/crc32.c
+--- libmpc-0.1~r394.old/common/crc32.c	2006-11-14 17:54:22.000000000 +0100
++++ libmpc-0.1~r394/common/crc32.c	2008-04-19 23:08:47.000000000 +0200
+@@ -50,7 +50,7 @@
+ }
+ 
+ /* Return the CRC of the bytes buf[0..len-1]. */
+-unsigned long crc32(unsigned char *buf, int len)
++unsigned long _mpc_crc32(unsigned char *buf, int len)
+ {
+ 	return update_crc(0xffffffffL, buf, len) ^ 0xffffffffL;
+ }
+diff -Naur libmpc-0.1~r394.old/libmpcdec/streaminfo.c libmpc-0.1~r394/libmpcdec/streaminfo.c
+--- libmpc-0.1~r394.old/libmpcdec/streaminfo.c	2008-04-05 19:09:57.000000000 +0200
++++ libmpc-0.1~r394/libmpcdec/streaminfo.c	2008-04-19 23:09:25.000000000 +0200
+@@ -42,7 +42,7 @@
+ #include "huffman.h"
+ #include "mpc_bits_reader.h"
+ 
+-unsigned long crc32(unsigned char *buf, int len);
++unsigned long _mpc_crc32(unsigned char *buf, int len);
+ 
+ static const char na[] = "n.a.";
+ static char const * const versionNames[] = {
+@@ -182,7 +182,7 @@
+ 	mpc_bits_reader r = *r_in;
+ 
+ 	CRC = (mpc_bits_read(&r, 16) << 16) | mpc_bits_read(&r, 16);
+-	if (CRC != crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
++	if (CRC != _mpc_crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
+ 		return MPC_STATUS_FILE;
+ 
+ 	si->stream_version = mpc_bits_read(&r, 8);
+diff -Naur libmpc-0.1~r394.old/libmpcenc/bitstream.c libmpc-0.1~r394/libmpcenc/bitstream.c
+--- libmpc-0.1~r394.old/libmpcenc/bitstream.c	2007-05-09 17:24:35.000000000 +0200
++++ libmpc-0.1~r394/libmpcenc/bitstream.c	2008-04-19 23:09:39.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include "libmpcenc.h"
+ #include "stdio.h"
+ 
+-unsigned long crc32(unsigned char *buf, int len);
++unsigned long _mpc_crc32(unsigned char *buf, int len);
+ 
+ #define MAX_ENUM 32
+ 
+@@ -205,7 +205,7 @@
+ 
+ 	if (addCRC) {
+ 		char tmp[4];
+-		unsigned long CRC32 = crc32((unsigned char *) e->buffer, e->pos);
++		unsigned long CRC32 = _mpc_crc32((unsigned char *) e->buffer, e->pos);
+ 		tmp[0] = (char) (CRC32 >> 24);
+ 		tmp[1] = (char) (CRC32 >> 16);
+ 		tmp[2] = (char) (CRC32 >> 8);