[SCM] mpg123/master: Provide 64bit wrappers on kFreeBSD/i386
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Aug 31 13:29:57 UTC 2013
The following commit has been merged in the master branch:
commit 779aa3baa516917ce7afdc7ce5d544971a08efaf
Author: Reinhard Tartler <siretart at fischer.debian.org>
Date: Sat Aug 31 07:51:26 2013 +0000
Provide 64bit wrappers on kFreeBSD/i386
Includes update for symbols file for kfreebsd
diff --git a/debian/libmpg123-0.symbols b/debian/libmpg123-0.symbols
index 02fa4df..5737e45 100644
--- a/debian/libmpg123-0.symbols
+++ b/debian/libmpg123-0.symbols
@@ -1,3 +1,3 @@
#include "libmpg123-0.symbols.common.in"
-(arch=!kfreebsd-i386)#include "libmpg123-0.symbols.64bit.in"
-(arch=!amd64 !ia64 !kfreebsd-amd64 !s390x !ppc64 !alpha !sparc64)#include "libmpg123-0.symbols.32bit.in"
+#include "libmpg123-0.symbols.64bit.in"
+(arch=!amd64 !ia64 !kfreebsd-i386 !kfreebsd-amd64 !s390x !ppc64 !alpha !sparc64)#include "libmpg123-0.symbols.32bit.in"
diff --git a/debian/patches/0002-provide-64bit-wrappers-on-kfreebsd.patch b/debian/patches/0002-provide-64bit-wrappers-on-kfreebsd.patch
new file mode 100644
index 0000000..d2900f0
--- /dev/null
+++ b/debian/patches/0002-provide-64bit-wrappers-on-kfreebsd.patch
@@ -0,0 +1,238 @@
+Description: provide 64bit wrappers on kfreebsd
+Author: Thomas Orgis <thomas-forum at orgis.org>
+Bug-Debian: http://bugs.debian.org/720440
+Origin: upstream
+Forwarded: not-needed
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -911,12 +911,16 @@ dnl Using the file_offset_bits variable
+ dnl Others... we'll have to see.
+ dnl Note: I started writing this with with multiline replacements.
+ dnl Does not work. Automake insists on putting these into Makefiles where they break things.
++dnl It is also assumed that a system that does not set file offset bits is not
++dnl sensitive to largefile changes, i.e. FreeBSD always using 64 bit off_t.
+ if test "x$ac_cv_sys_file_offset_bits" = x || echo "$ac_cv_sys_file_offset_bits" | $GREP '@<:@^0-9@:>@' > /dev/null; then
+ dnl if it has non-numeric chars or is empty... ignore...
+ LFS_LOBJ=
++ largefile_sensitive=no
+ else
+ # Add dual-mode wrapper code.
+ LFS_LOBJ=lfs_wrap.lo
++ largefile_sensitive=yes
+ fi
+
+ # Using the lower level macros instead of AC_TYPE_* for compatibility with not freshest autoconf.
+@@ -934,19 +938,30 @@ AC_CHECK_SIZEOF(off_t,4)
+ AC_CHECK_SIZEOF(int32_t)
+ AC_CHECK_SIZEOF(long,4)
+
+-# The alias functions want to know the native off_t bits.
+-# "Native" also means large file offsets, if enabled, it's what is native to the mpg123 library.
+-if test "x$ac_cv_sizeof_long" = "x"; then
+- AC_MSG_ERROR([Cannot determine sizeof(long)?])
++dnl The native type used for aliases is what off_t maps to without any largefile-
++dnl enabling switches. So, it's long int if the system is largefile-senstive,
++dnl but it is actual plain off_t if the system does not have such switches.
++if test "x$largefile_sensitive" = xyes; then
++ lfs_alias_type=long
++ lfs_alias_size=$ac_cv_sizeof_long
+ else
+- LFS_ALIAS_BITS=`expr "$ac_cv_sizeof_long" "*" "8"`
++ lfs_alias_type=off_t
++ lfs_alias_size=$ac_cv_sizeof_off_t
++fi
++
++if test "x$lfs_alias_size" = "x"; then
++ AC_MSG_ERROR([Cannot determine sizeof(lfs_alias_t)?])
++else
++ LFS_ALIAS_BITS=`expr "$lfs_alias_size" "*" "8"`
++ AC_DEFINE_UNQUOTED([lfs_alias_t], $lfs_alias_type,
++ [Define to the native offset type (long or actually off_t).])
+ AC_DEFINE_UNQUOTED([LFS_ALIAS_BITS], $LFS_ALIAS_BITS,
+- [Define this to the size of long type in bits, used for LFS small/native alias functions.])
++ [Define this to the size of native offset type in bits, used for LFS alias functions.])
+ fi
+
+ lfs_alias=enabled
+ AC_ARG_ENABLE(lfs-alias,
+- [ --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 in addition to mpg123_seek, mpg123_seek_64 as alias on x86-64) ],
++ [ --disable-lfs-alias disable alias wrappers for largefile bitness (mpg123_seek_32 or mpg123_seek_64 in addition to mpg123_seek, or the other way around; It is a mess, do not play with this!) ],
+ [
+ if test "x$enableval" = xno; then
+ lfs_alias="disabled"
+@@ -2211,6 +2226,7 @@ else
+ echo " The lib will (try to) support default offset size, too."
+ fi
+ echo " LFS alias symbols ....... $lfs_alias ($LFS_ALIAS_BITS)"
++echo " LFS alias type .......... $lfs_alias_type"
+
+ echo -n "
+ Core libmpg123 features:
+--- a/src/libmpg123/lfs_alias.c
++++ b/src/libmpg123/lfs_alias.c
+@@ -67,9 +67,9 @@ if(/^\s*EXPORT\s+(\S+)\s+(mpg123_\S+)\((
+ my $name = $2;
+ my $args = $3;
+ next unless ($type =~ /off_t/ or $args =~ /off_t/ or ($name =~ /open/ and $name ne mpg123_open_feed));
+- $type =~ s/off_t/long/g;
++ $type =~ s/off_t/lfs_alias_t/g;
+ my @nargs = ();
+- $args =~ s/off_t/long/g;
++ $args =~ s/off_t/lfs_alias_t/g;
+ foreach my $a (split(/,/, $args))
+ {
+ $a =~ s/^.*\s\**([a-z_]+)$/$1/;
+@@ -118,7 +118,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_decode_frame
+ #undef mpg123_decode_frame
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_decode_frame)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes)
++int attribute_align_arg ALIAS_NAME(mpg123_decode_frame)(mpg123_handle *mh, lfs_alias_t *num, unsigned char **audio, size_t *bytes)
+ {
+ return NATIVE_NAME(mpg123_decode_frame)(mh, num, audio, bytes);
+ }
+@@ -126,7 +126,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_framebyframe_decode
+ #undef mpg123_framebyframe_decode
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_framebyframe_decode)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes)
++int attribute_align_arg ALIAS_NAME(mpg123_framebyframe_decode)(mpg123_handle *mh, lfs_alias_t *num, unsigned char **audio, size_t *bytes)
+ {
+ return NATIVE_NAME(mpg123_framebyframe_decode)(mh, num, audio, bytes);
+ }
+@@ -134,7 +134,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_framepos
+ #undef mpg123_framepos
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_framepos)(mpg123_handle *mh)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_framepos)(mpg123_handle *mh)
+ {
+ return NATIVE_NAME(mpg123_framepos)(mh);
+ }
+@@ -142,7 +142,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_tell
+ #undef mpg123_tell
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_tell)(mpg123_handle *mh)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_tell)(mpg123_handle *mh)
+ {
+ return NATIVE_NAME(mpg123_tell)(mh);
+ }
+@@ -150,7 +150,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_tellframe
+ #undef mpg123_tellframe
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_tellframe)(mpg123_handle *mh)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_tellframe)(mpg123_handle *mh)
+ {
+ return NATIVE_NAME(mpg123_tellframe)(mh);
+ }
+@@ -158,7 +158,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_tell_stream
+ #undef mpg123_tell_stream
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_tell_stream)(mpg123_handle *mh)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_tell_stream)(mpg123_handle *mh)
+ {
+ return NATIVE_NAME(mpg123_tell_stream)(mh);
+ }
+@@ -166,7 +166,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_seek
+ #undef mpg123_seek
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_seek)(mpg123_handle *mh, long sampleoff, int whence)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_seek)(mpg123_handle *mh, lfs_alias_t sampleoff, int whence)
+ {
+ return NATIVE_NAME(mpg123_seek)(mh, sampleoff, whence);
+ }
+@@ -174,7 +174,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_feedseek
+ #undef mpg123_feedseek
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_feedseek)(mpg123_handle *mh, long sampleoff, int whence, long *input_offset)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_feedseek)(mpg123_handle *mh, lfs_alias_t sampleoff, int whence, lfs_alias_t *input_offset)
+ {
+ return NATIVE_NAME(mpg123_feedseek)(mh, sampleoff, whence, input_offset);
+ }
+@@ -182,7 +182,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_seek_frame
+ #undef mpg123_seek_frame
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_seek_frame)(mpg123_handle *mh, long frameoff, int whence)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_seek_frame)(mpg123_handle *mh, lfs_alias_t frameoff, int whence)
+ {
+ return NATIVE_NAME(mpg123_seek_frame)(mh, frameoff, whence);
+ }
+@@ -190,7 +190,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_timeframe
+ #undef mpg123_timeframe
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_timeframe)(mpg123_handle *mh, double sec)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_timeframe)(mpg123_handle *mh, double sec)
+ {
+ return NATIVE_NAME(mpg123_timeframe)(mh, sec);
+ }
+@@ -198,7 +198,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_index
+ #undef mpg123_index
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_index)(mpg123_handle *mh, long **offsets, long *step, size_t *fill)
++int attribute_align_arg ALIAS_NAME(mpg123_index)(mpg123_handle *mh, lfs_alias_t **offsets, lfs_alias_t *step, size_t *fill)
+ {
+ return NATIVE_NAME(mpg123_index)(mh, offsets, step, fill);
+ }
+@@ -206,7 +206,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_set_index
+ #undef mpg123_set_index
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_set_index)(mpg123_handle *mh, long *offsets, long step, size_t fill)
++int attribute_align_arg ALIAS_NAME(mpg123_set_index)(mpg123_handle *mh, lfs_alias_t *offsets, lfs_alias_t step, size_t fill)
+ {
+ return NATIVE_NAME(mpg123_set_index)(mh, offsets, step, fill);
+ }
+@@ -214,7 +214,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_position
+ #undef mpg123_position
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_position)( mpg123_handle *mh, long frame_offset, long buffered_bytes, long *current_frame, long *frames_left, double *current_seconds, double *seconds_left)
++int attribute_align_arg ALIAS_NAME(mpg123_position)( mpg123_handle *mh, lfs_alias_t frame_offset, lfs_alias_t buffered_bytes, lfs_alias_t *current_frame, lfs_alias_t *frames_left, double *current_seconds, double *seconds_left)
+ {
+ return NATIVE_NAME(mpg123_position)(mh, frame_offset, buffered_bytes, current_frame, frames_left, current_seconds, seconds_left);
+ }
+@@ -222,7 +222,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_length
+ #undef mpg123_length
+ #endif
+-long attribute_align_arg ALIAS_NAME(mpg123_length)(mpg123_handle *mh)
++lfs_alias_t attribute_align_arg ALIAS_NAME(mpg123_length)(mpg123_handle *mh)
+ {
+ return NATIVE_NAME(mpg123_length)(mh);
+ }
+@@ -230,7 +230,7 @@ long attribute_align_arg ALIAS_NAME(mpg1
+ #ifdef mpg123_set_filesize
+ #undef mpg123_set_filesize
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_set_filesize)(mpg123_handle *mh, long size)
++int attribute_align_arg ALIAS_NAME(mpg123_set_filesize)(mpg123_handle *mh, lfs_alias_t size)
+ {
+ return NATIVE_NAME(mpg123_set_filesize)(mh, size);
+ }
+@@ -238,7 +238,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_replace_reader
+ #undef mpg123_replace_reader
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_replace_reader)(mpg123_handle *mh, ssize_t (*r_read) (int, void *, size_t), long (*r_lseek)(int, long, int))
++int attribute_align_arg ALIAS_NAME(mpg123_replace_reader)(mpg123_handle *mh, ssize_t (*r_read) (int, void *, size_t), lfs_alias_t (*r_lseek)(int, lfs_alias_t, int))
+ {
+ return NATIVE_NAME(mpg123_replace_reader)(mh, r_read, r_lseek);
+ }
+@@ -246,7 +246,7 @@ int attribute_align_arg ALIAS_NAME(mpg12
+ #ifdef mpg123_replace_reader_handle
+ #undef mpg123_replace_reader_handle
+ #endif
+-int attribute_align_arg ALIAS_NAME(mpg123_replace_reader_handle)(mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), long (*r_lseek)(void *, long, int), void (*cleanup)(void*))
++int attribute_align_arg ALIAS_NAME(mpg123_replace_reader_handle)(mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), lfs_alias_t (*r_lseek)(void *, lfs_alias_t, int), void (*cleanup)(void*))
+ {
+ return NATIVE_NAME(mpg123_replace_reader_handle)(mh, r_read, r_lseek, cleanup);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index bd674ca..619355b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-disable_not_public_funcs.patch
+0002-provide-64bit-wrappers-on-kfreebsd.patch
--
mpg123 packaging
More information about the pkg-multimedia-commits
mailing list