diff options
author | Shane Volpe <shanevolpe@gmail.com> | 2008-08-19 16:26:27 +0000 |
---|---|---|
committer | Shane Volpe <shanevolpe@gmail.com> | 2008-08-19 16:26:27 +0000 |
commit | baf8d26c428809d0afe74fb2e6fcde9234a54808 (patch) | |
tree | 253eeebd8bf23c5f102e0c5f4198f14aaba282eb | |
parent | b36729cab279af95fa058b09ecd1f7fb6a5b9d8c (diff) | |
parent | f21e80fb9d9f9b62c27e33cafd49ca929dff80d9 (diff) |
merge of 'a5859fe0a66f4405c36b46c66e759ad901a4bcf8'
and 'bdef4ea2bcf85f3f2f7fe0f86441076fa860c5bc'
4 files changed, 36 insertions, 1 deletions
diff --git a/packages/directfb/files/use_limits_h.patch b/packages/directfb/files/use_limits_h.patch new file mode 100644 index 0000000000..327cd7a163 --- /dev/null +++ b/packages/directfb/files/use_limits_h.patch @@ -0,0 +1,10 @@ +--- FusionSound-1.0.0.orig/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_cdda.c ++++ FusionSound-1.0.0/interfaces/IFusionSoundMusicProvider/ifusionsoundmusicprovider_cdda.c +@@ -109,6 +109,7 @@ typedef struct { + + #if defined(__linux__) + ++#include <limits.h> + #include <linux/cdrom.h> + + static DFBResult diff --git a/packages/directfb/fusionsound-1.1.0+git20070709/.mtn2git_empty b/packages/directfb/fusionsound-1.1.0+git20070709/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/directfb/fusionsound-1.1.0+git20070709/.mtn2git_empty diff --git a/packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch b/packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch new file mode 100644 index 0000000000..0eb4c7519a --- /dev/null +++ b/packages/directfb/fusionsound-1.1.0+git20070709/fix-pkgconfig-cflags.patch @@ -0,0 +1,23 @@ +--- git/fusionsound.pc.in~org 2008-08-19 11:04:27.000000000 -0400 ++++ git/fusionsound.pc.in 2008-08-19 11:06:20.000000000 -0400 +@@ -8,4 +8,4 @@ + Description: Multi application sound streaming and mixing + Version: @VERSION@ + Libs: -L${libdir} -lfusionsound +-Cflags: -I@INCLUDEDIR@ ++Cflags: -I${includedir}/fusionsound +--- git/fusionsound-internal.pc.in~org 2008-08-19 11:11:57.000000000 -0400 ++++ git/fusionsound-internal.pc.in 2008-08-19 11:08:31.000000000 -0400 +@@ -1,10 +1,10 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + moduledir=@MODULEDIR@ +-includedir=@INTERNALINCLUDEDIR@ ++includedir=@includedir@ + + Name: FusionSound-Internal + Description: Third party module support package for FusionSound. + Version: @VERSION@ + Requires: fusionsound = @VERSION@ +-Cflags: -I@INTERNALINCLUDEDIR@ ++Cflags: -I${includedir}/fusionsound -I${includedir} diff --git a/packages/directfb/fusionsound_1.1.0+git20070709.bb b/packages/directfb/fusionsound_1.1.0+git20070709.bb index 54e2ba211f..dda1de5333 100644 --- a/packages/directfb/fusionsound_1.1.0+git20070709.bb +++ b/packages/directfb/fusionsound_1.1.0+git20070709.bb @@ -2,9 +2,11 @@ DESCRIPTION = "FusionSound for DirectFB" DEPENDS = "directfb" SECTION = "libs" LICENSE = "LGPL" -PR = "r0" +PR = "r2" SRC_URI = "git://git.directfb.org/git/directfb/core/FusionSound;protocol=git;tag=0b2162b570c8314fd1240b08d6ab4a8d074ccf37 \ + file://fix-pkgconfig-cflags.patch;patch=1 \ + file://use_limits_h.patch;patch=1 \ " S = "${WORKDIR}/git" |