Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Nov 2010 08:21:25 -0600
From:      Scott Allendorf <scott-allendorf@uiowa.edu>
To:        gnome@freebsd.org
Subject:   Problem with graphics/gdk-pixbuf2 on RELENG_6
Message-ID:  <4CF3B6E5.8060905@uiowa.edu>

next in thread | raw e-mail | index | archive | help
This is a cryptographically signed message in MIME format.

--------------ms010306090104070204000102
Content-Type: multipart/mixed; boundary="------------020707010603090207000700"

This is a multi-part message in MIME format.
--------------020707010603090207000700
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

The preprocessor from the base compiler in RELENG_6 appears to handle 
whitespace in preprocessor directives differently than the preprocessor 
in later versions.  It mistakes some comments for preprocessor 
directives in a couple of assembler files.  The attached patch allows 
gdk-pixbuf2 to compile with the base compiler on RELENG_6.

-Scott

-- 
Scott C. Allendorf                     Email:  scott-allendorf@uiowa.edu
UNIX Systems Administrator             Office:       216A Van Allen Hall
Department of Physics and Astronomy    Voice:             (319) 335-0003
The University of Iowa                 FAX:               (319) 335-1753
Iowa City, Iowa  52242-1479            ICBM:  41 39 43.6 N  91 31 55.1 W

--------------020707010603090207000700
Content-Type: text/plain;
 name="patch-gdk-pixbuf"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch-gdk-pixbuf"

--- gdk-pixbuf/pixops/have_mmx.S.orig	2010-11-26 09:49:50.000000000 -0600
+++ gdk-pixbuf/pixops/have_mmx.S	2010-11-26 09:50:14.000000000 -0600
@@ -42,7 +42,7 @@
 	
 	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 @@
 
 	je .notfound
 
-# OK, we have CPUID
+/* OK, we have CPUID */
 
 	movl	$1, %eax
 	cpuid
--- gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.orig	2010-11-26 09:49:38.000000000 -0600
+++ gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S	2010-11-26 09:50:42.000000000 -0600
@@ -189,8 +189,9 @@
 
 	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

--------------020707010603090207000700--

--------------ms010306090104070204000102
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIO/DCC
BEYwggOvoAMCAQICEGb9R+PCGeToms2Z3fU6yyQwDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UE
BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1Ymxp
YyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA1MTAyODAwMDAwMFoXDTE1
MTAyNzIzNTk1OVowgd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEf
MB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNl
IGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxHjAcBgNVBAsTFVBlcnNv
bmEgTm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFs
IFN1YnNjcmliZXIgQ0EgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnf
rOfq+PgDFMQAktXBfjbCPO98chXLwKuMPRyVzm8eECw/AO2XJua2x+atQx0/pIdHR0w+VPhs
+Mf8sZ69MHC8l7EDBeqV8a1AxUR6SwWi8mD81zplYu//EHuiVrvFTnAt1qIfPO2wQuhejVch
rKaZ2RHp0hoHwHRHQgv8xTTq/ea6JNEdCBU3otdzzwFBL2OyOj++pRpu9MlKWz2VphW7NQIZ
+dTvvI8OcXZZu0u2Ptb8Whb01g6J8kn+bAztFenZiHWcec5gJ925rXXOL3OVekA6hXVJsLjf
aLyrzROChRFQo+A8C67AClPN1zBvhTJGG+RJEMJs4q8fef/btLUCAwEAAaOB/zCB/DASBgNV
HRMBAf8ECDAGAQH/AgEAMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwEwKjAoBggrBgEFBQcC
ARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4
QgEBBAQDAgEGMC4GA1UdEQQnMCWkIzAhMR8wHQYDVQQDExZQcml2YXRlTGFiZWwzLTIwNDgt
MTU1MB0GA1UdDgQWBBQRfV4ZfTwE32ps1qKKGj8x2DuUUjAxBgNVHR8EKjAoMCagJKAihiBo
dHRwOi8vY3JsLnZlcmlzaWduLmNvbS9wY2ExLmNybDANBgkqhkiG9w0BAQUFAAOBgQA8o9oC
YzrEk6qrctPcrVA4HgyeFkqIt+7r2f8PjZWg1rv6aguuYYTYaEeJ70+ssh9JQZtJM3aTi55u
uUMcYL3C3Ioth8FFwBFyBBprJCpsb+f8BxMp0Hc6I+f1wYVoGb/GAVQgGa41gsxiPGEJxvTV
67APpp8zhZrTcY5Qj5ndYjCCBVUwggQ9oAMCAQICEDnmq/zE7naErgeOHwahlT0wDQYJKoZI
hvcNAQEFBQAwgd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0G
A1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0
IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxHjAcBgNVBAsTFVBlcnNvbmEg
Tm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1
YnNjcmliZXIgQ0EgLSBHMjAeFw0xMDAxMTcwMDAwMDBaFw0xMTAxMTcyMzU5NTlaMIIBHjEX
MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
cmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5jb3JwLiBi
eSBSZWYuLExJQUIuTFREKGMpOTgxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDEz
MDEGA1UECxMqRGlnaXRhbCBJRCBDbGFzcyAxIC0gTmV0c2NhcGUgRnVsbCBTZXJ2aWNlMRsw
GQYDVQQDFBJTY290dCBDLiBBbGxlbmRvcmYxKDAmBgkqhkiG9w0BCQEWGXNjb3R0LWFsbGVu
ZG9yZkB1aW93YS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDt//Dej9TP
OggYYqhk3Si72zWISvmmAH4BIeK4Ybm3ExAzGAEruWni7lHItPo27u12lwvisjvq2rOVWiPI
8UlFkOA6Xyqw8h+8bXQKu875UOVuFzS5NyzPx7lTNl3c/bFeWyk9coVFGy9z9BjVCev3IZFj
ijOJEUzQFwqIOT3vQXgEo9pwbneXs6r9g3/Z4pZFcQUpX6iizAct/ccryQRGpfqSQrFn/4uz
RpjWUe/lnghz4k1I2chI87SkS32919l4TtS9VN8mhaFD5fyDSOJdGEb6XX1WBb3dL7lDHBYA
34LDZ5n/Dnknhu0Rm1IfEPB/y3kC/r0lzOYtV5J2e4tTAgMBAAGjgcwwgckwCQYDVR0TBAIw
ADBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3
LnZlcmlzaWduLmNvbS9ycGEwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMEBggr
BgEFBQcDAjBKBgNVHR8EQzBBMD+gPaA7hjlodHRwOi8vSW5kQzFEaWdpdGFsSUQtY3JsLnZl
cmlzaWduLmNvbS9JbmRDMURpZ2l0YWxJRC5jcmwwDQYJKoZIhvcNAQEFBQADggEBALAUa3EV
maWXNtLDHgiQhCkEnHS6DClyqE29sPgVug0xyF6vChlW7Dj+kwOyIPuX8h5kkqJMBL2Q0EuB
0cg8LIGCMrtW3gB9NWOiLH27G/z2aCZK9yShyBLRlsZDZ4cQ2yHXCqDfR7m1o6cebAwPsNCD
+gtO2Bo8yZ9LpRz/CeWYmcPrdWclMENkYMWD3sXYy//j08n6AtSO2vo2TxjjXeslClZOz79v
vUHaixHn6xBY0eB7gp1YVjLx/od/2BeRO1Y84j/4hVR08E1+DAGaxyWuIe7krk28T4c1DJHa
bxB0Psjr525t3zjSqfD0g27u/lYS5XFMAFSZy8NCUxuivIswggVVMIIEPaADAgECAhA55qv8
xO52hK4Hjh8GoZU9MA0GCSqGSIb3DQEBBQUAMIHdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMO
VmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNV
BAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1
MR4wHAYDVQQLExVQZXJzb25hIE5vdCBWYWxpZGF0ZWQxNzA1BgNVBAMTLlZlcmlTaWduIENs
YXNzIDEgSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBIC0gRzIwHhcNMTAwMTE3MDAwMDAwWhcN
MTEwMTE3MjM1OTU5WjCCAR4xFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3JlcG9z
aXRvcnkvUlBBIEluY29ycC4gYnkgUmVmLixMSUFCLkxURChjKTk4MR4wHAYDVQQLExVQZXJz
b25hIE5vdCBWYWxpZGF0ZWQxMzAxBgNVBAsTKkRpZ2l0YWwgSUQgQ2xhc3MgMSAtIE5ldHNj
YXBlIEZ1bGwgU2VydmljZTEbMBkGA1UEAxQSU2NvdHQgQy4gQWxsZW5kb3JmMSgwJgYJKoZI
hvcNAQkBFhlzY290dC1hbGxlbmRvcmZAdWlvd2EuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEA7f/w3o/UzzoIGGKoZN0ou9s1iEr5pgB+ASHiuGG5txMQMxgBK7lp4u5R
yLT6Nu7tdpcL4rI76tqzlVojyPFJRZDgOl8qsPIfvG10CrvO+VDlbhc0uTcsz8e5UzZd3P2x
XlspPXKFRRsvc/QY1Qnr9yGRY4oziRFM0BcKiDk970F4BKPacG53l7Oq/YN/2eKWRXEFKV+o
oswHLf3HK8kERqX6kkKxZ/+Ls0aY1lHv5Z4Ic+JNSNnISPO0pEt9vdfZeE7UvVTfJoWhQ+X8
g0jiXRhG+l19VgW93S+5QxwWAN+Cw2eZ/w55J4btEZtSHxDwf8t5Av69JczmLVeSdnuLUwID
AQABo4HMMIHJMAkGA1UdEwQCMAAwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXATAqMCgGCCsG
AQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMAsGA1UdDwQEAwIFoDAdBgNV
HSUEFjAUBggrBgEFBQcDBAYIKwYBBQUHAwIwSgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL0lu
ZEMxRGlnaXRhbElELWNybC52ZXJpc2lnbi5jb20vSW5kQzFEaWdpdGFsSUQuY3JsMA0GCSqG
SIb3DQEBBQUAA4IBAQCwFGtxFZmllzbSwx4IkIQpBJx0ugwpcqhNvbD4FboNMcherwoZVuw4
/pMDsiD7l/IeZJKiTAS9kNBLgdHIPCyBgjK7Vt4AfTVjoix9uxv89mgmSvckocgS0ZbGQ2eH
ENsh1wqg30e5taOnHmwMD7DQg/oLTtgaPMmfS6Uc/wnlmJnD63VnJTBDZGDFg97F2Mv/49PJ
+gLUjtr6Nk8Y413rJQpWTs+/b71B2osR5+sQWNHge4KdWFYy8f6Hf9gXkTtWPOI/+IVUdPBN
fgwBmsclriHu5K5NvE+HNQyR2m8QdD7I6+dubd840qnw9INu7v5WEuVxTABUmcvDQlMboryL
MYIE7DCCBOgCAQEwgfIwgd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j
LjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2Yg
dXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxHjAcBgNVBAsTFVBl
cnNvbmEgTm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlk
dWFsIFN1YnNjcmliZXIgQ0EgLSBHMgIQOear/MTudoSuB44fBqGVPTAJBgUrDgMCGgUAoIIC
zjAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xMDExMjkxNDIx
MjVaMCMGCSqGSIb3DQEJBDEWBBR6L3nx/1AYDhscz3deWW4hgvyQHjBfBgkqhkiG9w0BCQ8x
UjBQMAsGCWCGSAFlAwQBAjAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcN
AwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwggEDBgkrBgEEAYI3EAQxgfUwgfIwgd0x
CzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
Z24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3
LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRl
ZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0Eg
LSBHMgIQOear/MTudoSuB44fBqGVPTCCAQUGCyqGSIb3DQEJEAILMYH1oIHyMIHdMQswCQYD
VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
dXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJp
c2lnbi5jb20vcnBhIChjKTA1MR4wHAYDVQQLExVQZXJzb25hIE5vdCBWYWxpZGF0ZWQxNzA1
BgNVBAMTLlZlcmlTaWduIENsYXNzIDEgSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBIC0gRzIC
EDnmq/zE7naErgeOHwahlT0wDQYJKoZIhvcNAQEBBQAEggEARk7X3wNMWen5GN+on9M8b0Sb
pfWT/mXsLRQgQdFDsSbkq27bGtK0Xq9afD/meurzDIw3TPFP4eN0akBVnN90U6fxtjFNFTOk
+dDPCx2neijFYOuQe3Oze9qEP5Wjmz27j+7Ek7oXrmsusgZxQNNWB67W+Yaq6QmBGcckPeas
3vzRdosOqDF5CVkpWHs2Fzo0UsxYpeVTgQkEF8uj+INH9XQzWiZJEriC9nz15Lxkcq1IhfKG
GTlFjOtN7T/ldhYXtshCzy1u4xuVh2de5/VbkqN15Jfen4Tasd5d/Rvpy7MKMRr5JIPOtZcv
dTGev4mwc/tfWDl0n0NdMfZF+/RHWAAAAAAAAA==
--------------ms010306090104070204000102--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4CF3B6E5.8060905>