[28079] trunk/dports/multimedia/libogg

source_changes at macosforge.org source_changes at macosforge.org
Sun Aug 19 16:39:02 PDT 2007


Revision: 28079
          http://trac.macosforge.org/projects/macports/changeset/28079
Author:   raimue at macports.org
Date:     2007-08-19 16:39:01 -0700 (Sun, 19 Aug 2007)

Log Message:
-----------
multimedia/libogg:
Adding a patch from https://trac.xiph.org/ticket/849
This fixes an issue with building ices2
Thanks to Tobias Weber

Modified Paths:
--------------
    trunk/dports/multimedia/libogg/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/libogg/files/
    trunk/dports/multimedia/libogg/files/libogg.patch

Modified: trunk/dports/multimedia/libogg/Portfile
===================================================================
--- trunk/dports/multimedia/libogg/Portfile	2007-08-19 23:23:32 UTC (rev 28078)
+++ trunk/dports/multimedia/libogg/Portfile	2007-08-19 23:39:01 UTC (rev 28079)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name             libogg
 version          1.1.3
+revision         1
 categories       multimedia
 maintainers      nomaintainer at macports.org
 description      Ogg Bitstream Library
@@ -14,6 +15,13 @@
 master_sites     http://downloads.xiph.org/releases/ogg/
 checksums        sha1 a3e495a8baf6939efad7e0bd11cc0e466838c3db
 
+# from https://trac.xiph.org/ticket/849
+patchfiles       libogg.patch
+patch.args       -p1
+
+# we need to use autoconf, as the patch changes configure.in
+use_autoconf     yes
+
 post-configure {
 	if {[variant_isset universal]} {
 		reinplace "s|CC -dynamiclib|CC -dynamiclib ${configure.universal_ldflags}|g" ${worksrcpath}/libtool

Added: trunk/dports/multimedia/libogg/files/libogg.patch
===================================================================
--- trunk/dports/multimedia/libogg/files/libogg.patch	                        (rev 0)
+++ trunk/dports/multimedia/libogg/files/libogg.patch	2007-08-19 23:39:01 UTC (rev 28079)
@@ -0,0 +1,231 @@
+diff -ru libogg-1.1.3/configure.in libogg-1.1.3-patched/configure.in
+--- libogg-1.1.3/configure.in	2005-11-28 05:26:07.000000000 +0100
++++ libogg-1.1.3-patched/configure.in	2006-04-27 10:33:44.000000000 +0200
+@@ -81,180 +81,40 @@
+ 
+ dnl Check for types
+ 
+-AC_MSG_CHECKING(for int16_t)
+-AC_CACHE_VAL(has_int16_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-int16_t foo;
+-int main() {return 0;}
+-],
+-has_int16_t=yes,
+-has_int16_t=no,
+-has_int16_t=no
+-)])
+-AC_MSG_RESULT($has_int16_t)
+-
+-AC_MSG_CHECKING(for int32_t)
+-AC_CACHE_VAL(has_int32_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-int32_t foo;
+-int main() {return 0;}
+-],
+-has_int32_t=yes,
+-has_int32_t=no,
+-has_int32_t=no
+-)])
+-AC_MSG_RESULT($has_int32_t)
+-
+-AC_MSG_CHECKING(for uint32_t)
+-AC_CACHE_VAL(has_uint32_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-uint32_t foo;
+-int main() {return 0;}
+-],
+-has_uint32_t=yes,
+-has_uint32_t=no,
+-has_uint32_t=no
+-)])
+-AC_MSG_RESULT($has_uint32_t)
+-
+-AC_MSG_CHECKING(for uint16_t)
+-AC_CACHE_VAL(has_uint16_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-uint16_t foo;
+-int main() {return 0;}
+-],
+-has_uint16_t=yes,
+-has_uint16_t=no,
+-has_uint16_t=no
+-)])
+-AC_MSG_RESULT($has_uint16_t)
+-
+-AC_MSG_CHECKING(for u_int32_t)
+-AC_CACHE_VAL(has_u_int32_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-u_int32_t foo;
+-int main() {return 0;}
+-],
+-has_u_int32_t=yes,
+-has_u_int32_t=no,
+-has_u_int32_t=no
+-)])
+-AC_MSG_RESULT($has_u_int32_t)
+-
+-AC_MSG_CHECKING(for u_int16_t)
+-AC_CACHE_VAL(has_u_int16_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-u_int16_t foo;
+-int main() {return 0;}
+-],
+-has_u_int16_t=yes,
+-has_u_int16_t=no,
+-has_u_int16_t=no
+-)])
+-AC_MSG_RESULT($has_u_int16_t)
+-
+-AC_MSG_CHECKING(for int64_t)
+-AC_CACHE_VAL(has_int64_t,
+-[AC_TRY_RUN([
+-#ifdef __BEOS__
+-#include <inttypes.h>
+-#endif
+-#include <sys/types.h>
+-int64_t foo;
+-int main() {return 0;}
+-],
+-has_int64_t=yes,
+-has_int64_t=no,
+-has_int64_t=no
+-)])
+-AC_MSG_RESULT($has_int64_t)
+-
+ AC_CHECK_SIZEOF(short)
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(long long)
+ 
++case 2 in
++        $ac_cv_sizeof_short) SIZE16="short";;
++        $ac_cv_sizeof_int) SIZE16="int";;
++esac
+ 
+-if test x$has_int16_t = "xyes" ; then
+-        SIZE16="int16_t"
+-else
+-        case 2 in
+-                $ac_cv_sizeof_short) SIZE16="short";;
+-                $ac_cv_sizeof_int) SIZE16="int";;
+-        esac
+-fi
+-
+-if test x$has_int32_t = "xyes" ; then
+-        SIZE32="int32_t"
+-else
+-        case 4 in
+-                $ac_cv_sizeof_short) SIZE32="short";;
+-                $ac_cv_sizeof_int) SIZE32="int";;
+-                $ac_cv_sizeof_long) SIZE32="long";;
+-        esac
+-fi
++case 4 in
++        $ac_cv_sizeof_short) SIZE32="short";;
++        $ac_cv_sizeof_int) SIZE32="int";;
++        $ac_cv_sizeof_long) SIZE32="long";;
++esac
+ 
+-if test x$has_uint32_t = "xyes" ; then
+-        USIZE32="uint32_t"
+-else
+-        if test x$has_u_int32_t = "xyes" ; then
+-                USIZE32="u_int32_t"
+-        else
+-                case 4 in
+-                        $ac_cv_sizeof_short) USIZE32="unsigned short";;
+-                        $ac_cv_sizeof_int) USIZE32="unsigned int";;
+-                        $ac_cv_sizeof_long) USIZE32="unsigned long";;
+-                esac
+-        fi
+-fi
++case 4 in
++        $ac_cv_sizeof_short) USIZE32="unsigned short";;
++        $ac_cv_sizeof_int) USIZE32="unsigned int";;
++        $ac_cv_sizeof_long) USIZE32="unsigned long";;
++esac
+ 
+-if test x$has_uint16_t = "xyes" ; then
+-        USIZE16="uint16_t"
+-else
+-        if test x$has_u_int16_t = "xyes" ; then
+-                USIZE16="u_int16_t"
+-        else
+-                case 2 in
+-                        $ac_cv_sizeof_short) USIZE16="unsigned short";;
+-                        $ac_cv_sizeof_int) USIZE16="unsigned int";;
+-                        $ac_cv_sizeof_long) USIZE16="unsigned long";;
+-                esac
+-        fi
+-fi
++case 2 in
++        $ac_cv_sizeof_short) USIZE16="unsigned short";;
++        $ac_cv_sizeof_int) USIZE16="unsigned int";;
++        $ac_cv_sizeof_long) USIZE16="unsigned long";;
++esac
+ 
+-if test x$has_int64_t = "xyes" ; then
+-        SIZE64="int64_t"
+-else
+ case 8 in
+         $ac_cv_sizeof_int) SIZE64="int";;
+         $ac_cv_sizeof_long) SIZE64="long";;
+         $ac_cv_sizeof_long_long) SIZE64="long long";;
+ esac
+-fi
++
+ 
+ if test -z "$SIZE16"; then
+         AC_MSG_ERROR(No 16 bit type found on this platform!)
+diff -ru libogg-1.1.3/include/ogg/os_types.h libogg-1.1.3-patched/include/ogg/os_types.h
+--- libogg-1.1.3/include/ogg/os_types.h	2005-11-28 05:26:05.000000000 +0100
++++ libogg-1.1.3-patched/include/ogg/os_types.h	2006-04-27 10:30:49.000000000 +0200
+@@ -64,15 +64,6 @@
+    typedef UInt32 ogg_uint32_t;
+    typedef SInt64 ogg_int64_t;
+ 
+-#elif defined(__MACOSX__) /* MacOS X Framework build */
+-
+-#  include <sys/types.h>
+-   typedef int16_t ogg_int16_t;
+-   typedef u_int16_t ogg_uint16_t;
+-   typedef int32_t ogg_int32_t;
+-   typedef u_int32_t ogg_uint32_t;
+-   typedef int64_t ogg_int64_t;
+-
+ #elif defined(__BEOS__)
+ 
+    /* Be */
+@@ -119,7 +110,6 @@
+ 
+ #else
+ 
+-#  include <sys/types.h>
+ #  include <ogg/config_types.h>
+ 
+ #endif

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070819/b5066e10/attachment.html


More information about the macports-changes mailing list