diff options
| author | he <he@pkgsrc.org> | 2010-11-23 13:05:22 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2010-11-23 13:05:22 +0000 |
| commit | 5da55e1db9d5fa6661eed72f062b076109d11be3 (patch) | |
| tree | 493fdf8710c52256847f6c6a88e2b978d3139ae5 /graphics/gdk-pixbuf2 | |
| parent | 4785e1c0459cb1a69404b09cae6a1872a6a57ec8 (diff) | |
| download | pkgsrc-5da55e1db9d5fa6661eed72f062b076109d11be3.tar.gz | |
Add a pair of patches so that this package builds on NetBSD/i386.
Some of the assembly files are passed through the C preprocessor,
and that means you can't use # as comment character as it will be
mis-interpreted as an invalid C preprocessing directive.
No revision bump since this is only a build fix.
Comment time-out from last updater of this package.
Diffstat (limited to 'graphics/gdk-pixbuf2')
| -rw-r--r-- | graphics/gdk-pixbuf2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/patches/patch-ad | 26 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/patches/patch-ae | 19 |
3 files changed, 48 insertions, 1 deletions
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index 0760a286034..dedfa1c1fd5 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2010/11/16 16:45:07 drochner Exp $ +$NetBSD: distinfo,v 1.4 2010/11/23 13:05:22 he Exp $ SHA1 (gdk-pixbuf-2.22.1.tar.bz2) = b452208963ddd84f7280865695b50255fcafaa2e RMD160 (gdk-pixbuf-2.22.1.tar.bz2) = d05d6642e147281b7dc1dd21657595333f13f6f1 @@ -6,3 +6,5 @@ Size (gdk-pixbuf-2.22.1.tar.bz2) = 1543273 bytes SHA1 (patch-aa) = d5106a1436ad6899c30188c46246a066b13548df SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef SHA1 (patch-ac) = f8c8ff3175cee6a88938a0aaa081d3bd832a050d +SHA1 (patch-ad) = 00b9186e0d3513a518c263b6d2f8350fc977580d +SHA1 (patch-ae) = d4ad340e16589c579ec964bf95fd951b334adf04 diff --git a/graphics/gdk-pixbuf2/patches/patch-ad b/graphics/gdk-pixbuf2/patches/patch-ad new file mode 100644 index 00000000000..979a9eced94 --- /dev/null +++ b/graphics/gdk-pixbuf2/patches/patch-ad @@ -0,0 +1,26 @@ +$NetBSD: patch-ad,v 1.1 2010/11/23 13:05:22 he Exp $ + +This file is passed through the C preprocessor, so we have +to use C comments to acheive the desired effect, so that these +are not mis-interpreted as invalid C preprocessing directives. + +--- gdk-pixbuf/pixops/have_mmx.S.orig 2010-11-19 11:41:03.000000000 +0000 ++++ gdk-pixbuf/pixops/have_mmx.S +@@ -42,7 +42,7 @@ __pixops_have_mmx: + + push %ebx + +-# Check if bit 21 in flags word is writeable ++/* # Check if bit 21 in flags word is writeable */ + + pushfl + popl %eax +@@ -57,7 +57,7 @@ __pixops_have_mmx: + + je .notfound + +-# OK, we have CPUID ++/* # OK, we have CPUID */ + + movl $1, %eax + cpuid diff --git a/graphics/gdk-pixbuf2/patches/patch-ae b/graphics/gdk-pixbuf2/patches/patch-ae new file mode 100644 index 00000000000..58f233022a0 --- /dev/null +++ b/graphics/gdk-pixbuf2/patches/patch-ae @@ -0,0 +1,19 @@ +$NetBSD: patch-ae,v 1.1 2010/11/23 13:05:22 he Exp $ + +This file is passed through the C preprocessor, so we have +to use C comments to acheive the desired effect, so that these +are not mis-interpreted as invalid C preprocessing directives. + +--- gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.orig 2010-06-25 21:40:10.000000000 +0000 ++++ gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S +@@ -189,8 +189,8 @@ __pixops_composite_line_22_4a4_mmx: + + shll $2, %edx + +-# %mm4 will always be already clear here +-# pxor %mm4, %mm4 ++/* # %mm4 will always be already clear here */ ++/* # pxor %mm4, %mm4 */ + + movl 16(%ebp),%edi + movl (%edi, %edx), %eax |