April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Simplify the data. buffer_object assignment in surface_load_texture().
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: cd0c18f56b420b44017e839f6fd8f14c945105d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0c18f56b420b44017e839f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 8 19:13:22 2012 +0200 wined3d: Simplify the data.buffer_object assignment in surface_load_texture(). The surface pbo field should be 0 is SFLAG_PBO is not set. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 98d259c..29035fe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6177,7 +6177,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, mem = surface->resource.allocatedMemory; } - data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0; + data.buffer_object = surface->pbo; data.addr = mem; surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data);

1 0

Henri Verbeet : ddraw: Simplify updating palette entries in d3d_texture2_Load().
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 02b9988f486a999a6e200669ec76e8d734ecb2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b9988f486a999a6e200669e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 8 19:13:23 2012 +0200 ddraw: Simplify updating palette entries in d3d_texture2_Load(). --- dlls/ddraw/surface.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2475522..49d6953 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5071,7 +5071,6 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu for (;;) { struct wined3d_palette *wined3d_dst_pal, *wined3d_src_pal; - IDirectDrawPalette *dst_pal = NULL, *src_pal = NULL; DDSURFACEDESC *src_desc, *dst_desc; TRACE("Copying surface %p to surface %p (mipmap level %d).\n", @@ -5082,24 +5081,19 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu /* Get the palettes */ wined3d_dst_pal = wined3d_surface_get_palette(dst_surface->wined3d_surface); - if (wined3d_dst_pal) - dst_pal = wined3d_palette_get_parent(wined3d_dst_pal); - wined3d_src_pal = wined3d_surface_get_palette(src_surface->wined3d_surface); - if (wined3d_src_pal) - src_pal = wined3d_palette_get_parent(wined3d_src_pal); - if (src_pal) + if (wined3d_src_pal) { PALETTEENTRY palent[256]; - if (!dst_pal) + if (!wined3d_dst_pal) { wined3d_mutex_unlock(); return DDERR_NOPALETTEATTACHED; } - IDirectDrawPalette_GetEntries(src_pal, 0, 0, 256, palent); - IDirectDrawPalette_SetEntries(dst_pal, 0, 0, 256, palent); + wined3d_palette_get_entries(wined3d_src_pal, 0, 0, 256, palent); + wined3d_palette_set_entries(wined3d_dst_pal, 0, 0, 256, palent); } /* Copy one surface on the other */

1 0

Henri Verbeet : ddraw: Properly retrieve an interface pointer in ddraw_surface7_GetPalette().
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 9d317e632fb6d2388d3de30f67774704216c7e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d317e632fb6d2388d3de30f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 8 19:13:24 2012 +0200 ddraw: Properly retrieve an interface pointer in ddraw_surface7_GetPalette(). --- dlls/ddraw/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 49d6953..95ee9c1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4467,6 +4467,7 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); struct wined3d_palette *wined3d_palette; + struct ddraw_palette *palette_impl; HRESULT hr = DD_OK; TRACE("iface %p, palette %p.\n", iface, Pal); @@ -4478,7 +4479,8 @@ static HRESULT WINAPI ddraw_surface7_GetPalette(IDirectDrawSurface7 *iface, IDir wined3d_palette = wined3d_surface_get_palette(surface->wined3d_surface); if (wined3d_palette) { - *Pal = wined3d_palette_get_parent(wined3d_palette); + palette_impl = wined3d_palette_get_parent(wined3d_palette); + *Pal = &palette_impl->IDirectDrawPalette_iface; IDirectDrawPalette_AddRef(*Pal); } else

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXConstantTableImpl_QueryInterface ().
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: db18815147bdd6b3ee6a4fde3019eb123992b8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=db18815147bdd6b3ee6a4fde3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 8 19:13:25 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXConstantTableImpl_QueryInterface(). --- dlls/d3dx9_36/shader.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 29b4f6e..e0229f6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -658,18 +658,16 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **ppvObject) +static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out) { - struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer) || IsEqualGUID(riid, &IID_ID3DXConstantTable)) { ID3DXConstantTable_AddRef(iface); - *ppvObject = This; + *out = iface; return S_OK; }

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXMeshImpl_QueryInterface().
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 531818846ad6a5edc8700197970ed4e8be7bf705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531818846ad6a5edc87001979… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 8 19:13:26 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXMeshImpl_QueryInterface(). --- dlls/d3dx9_36/mesh.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 84856b3..be8ca60 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -96,16 +96,14 @@ static inline ID3DXMeshImpl *impl_from_ID3DXMesh(ID3DXMesh *iface) static HRESULT WINAPI ID3DXMeshImpl_QueryInterface(ID3DXMesh *iface, REFIID riid, LPVOID *object) { - ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBaseMesh) || IsEqualGUID(riid, &IID_ID3DXMesh)) { iface->lpVtbl->AddRef(iface); - *object = This; + *object = iface; return S_OK; }

1 0

Bruno Jesus : ws2_32/tests: Add hostent struct tests for gethostbyname.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 7d7995c66cfac60d293fdfbb2b2942821d89c785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7995c66cfac60d293fdfbb2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Apr 7 19:45:04 2012 -0300 ws2_32/tests: Add hostent struct tests for gethostbyname. --- dlls/ws2_32/tests/sock.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cc045ea..53cf2c8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2730,10 +2730,50 @@ static void test_getsockname(void) static void test_dns(void) { - struct hostent *h; + struct hostent *h, *he, host; + union memaddress + { + char *chr; + void *mem; + } addr; + char **ptr; + int acount; + void *ip_addr, *alias_addr; h = gethostbyname(""); ok(h != NULL, "gethostbyname(\"\") failed with %d\n", h_errno); + + if(h) host = *h; + + /* Use an address with valid alias names if possible */ + he = gethostbyname("source.winehq.org"); + if(he) + h = he; + else if (h) + h = &host; + else + { + skip("Can't test the hostent structure because gethostbyname failed\n"); + return; + } + + /* The returned struct must be allocated in a very strict way. First we need to + * count how many aliases there are because they must be located right after + * the struct hostent size. Knowing the amount of aliases we know the exact + * location of the first IP returned. Rule valid for >= XP, for older OS's + * it's somewhat the opposite. */ + for(ptr = h->h_aliases, acount = 1; *ptr; ptr++) acount++; + + addr.mem = h + 1; + alias_addr = addr.mem; + + todo_wine ok(h->h_aliases == alias_addr || broken(h->h_addr_list == alias_addr /* <= W2K */ ), + "hostent->h_aliases should be in %p, it is in %p\n", alias_addr, h->h_aliases); + + addr.chr += sizeof(h->h_aliases) * acount; + ip_addr = addr.mem; + todo_wine ok(h->h_addr_list == ip_addr || broken(h->h_addr_list == alias_addr /* <= W2K */ ), + "hostent->h_addr_list should be in %p, it is in %p\n", ip_addr, h->h_addr_list); } /* Our winsock headers don't define gethostname because it conflicts with the

1 0

Morten Rønne : po: Updated Danish translation.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 1a29c106a7566f7683d1ef8f1c396e7d6ca887e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a29c106a7566f7683d1ef8f1… Author: Morten Rønne <morten.roenne(a)tdcadsl.dk> Date: Sat Mar 31 10:51:56 2012 +0200 po: Updated Danish translation. --- po/da.po | 690 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 380 insertions(+), 310 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a29c106a7566f7683d1e…

1 0

Francois Gouget : po: Remove duplicate spaces between sentences.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 8abb0ffadd71f40a095a4cfc4e645268377342e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abb0ffadd71f40a095a4cfc4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 9 02:40:46 2012 +0200 po: Remove duplicate spaces between sentences. --- po/eo.po | 2 +- po/es.po | 14 +++++++------- po/pt_PT.po | 2 +- po/sv.po | 12 ++++++------ po/uk.po | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/po/eo.po b/po/eo.po index 4b7b3ca..6ea87ed 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8623,7 +8623,7 @@ msgstr "&Elira dosiernomo:" #: winspool.rc:28 msgid "The output file already exists. Click OK to overwrite." -msgstr "La elira dosiero jam ekzistas. Klaki sur 'Bone' por anstataŭi ĝin." +msgstr "La elira dosiero jam ekzistas. Klaki sur 'Bone' por anstataŭi ĝin." #: winspool.rc:29 msgid "Unable to create the output file." diff --git a/po/es.po b/po/es.po index a200fd3..157e963 100644 --- a/po/es.po +++ b/po/es.po @@ -7177,7 +7177,7 @@ msgid "" "activate it using %s. It will be displayed as an icon." msgstr "" "Inserta el contenido del portapapeles en su documento de modo que pueda " -"activarlo usando %s. Será mostrado como un icono." +"activarlo usando %s. Será mostrado como un icono." #: oledlg.rc:37 msgid "" @@ -7185,7 +7185,7 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"Inserta el contenido del portapapeles en su documento como %s. Los datos " +"Inserta el contenido del portapapeles en su documento como %s. Los datos " "estarán enlazados al archivo de origen, por lo que los cambios en el archivo " "se reflejarán en su documento." @@ -7195,9 +7195,9 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"Inserta una imagen del contenido del portapapeles en su documento. La " -"imagen estará enlazada al archivo de origen, por lo que los cambios en el " -"archivo se reflejarán en su documento." +"Inserta una imagen del contenido del portapapeles en su documento. La imagen " +"estará enlazada al archivo de origen, por lo que los cambios en el archivo " +"se reflejarán en su documento." #: oledlg.rc:39 msgid "" @@ -7206,8 +7206,8 @@ msgid "" "be reflected in your document." msgstr "" "Inserta un acceso directo que apunte a la localización del contenido del " -"portapapeles. El acceso directo estará enlazado al archivo de origen, por " -"lo que los cambios en el archivo se reflejarán en su documento." +"portapapeles. El acceso directo estará enlazado al archivo de origen, por lo " +"que los cambios en el archivo se reflejarán en su documento." #: oledlg.rc:40 msgid "Inserts the contents of the clipboard into your document." diff --git a/po/pt_PT.po b/po/pt_PT.po index 2944e96..6af4073 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8131,7 +8131,7 @@ msgstr "" "\n" "O Wine é distribuído na esperança que seja útil, mas SEM QUALQUER GARANTIA; " "nem sequer a garantia implícita de MERCANTIBILIDADE ou FEITO PARA UM " -"PROPÓSITO ESPECÍFICO. veja a GNU Lesser General Public License para mais " +"PROPÓSITO ESPECÍFICO. veja a GNU Lesser General Public License para mais " "detalhes.\n" "\n" "Deverá ter recebido uma cópia da GNU Lesser General Public License com o " diff --git a/po/sv.po b/po/sv.po index c74d60d..65fafe1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2162,9 +2162,9 @@ msgstr "" "återkallade och betrodda certifikat.\n" "\n" "Ett certifikat kan användas för att identifiera dig eller datorn som du " -"kommunicerar med. Det kan även användas för autentisering samt för att " -"signera meddelanden. Certifikatlager är samlingar av certifikat, listor " -"över återkallade certifikat, och listor över betrodda certifikat.\n" +"kommunicerar med. Det kan även användas för autentisering samt för att " +"signera meddelanden. Certifikatlager är samlingar av certifikat, listor över " +"återkallade certifikat, och listor över betrodda certifikat.\n" "\n" "Klicka Nästa för att fortsätta." @@ -2296,9 +2296,9 @@ msgstr "" "återkallade och betrodda certifikat.\n" "\n" "Ett certifikat kan användas för att identifiera dig eller datorn som du " -"kommunicerar med. Det kan även användas för autentisering samt för att " -"signera meddelanden. Certifikatlager är samlingar av certifikat, listor " -"över återkallade certifikat, och listor över betrodda certifikat.\n" +"kommunicerar med. Det kan även användas för autentisering samt för att " +"signera meddelanden. Certifikatlager är samlingar av certifikat, listor över " +"återkallade certifikat, och listor över betrodda certifikat.\n" "\n" "Klicka Nästa för att fortsätta." diff --git a/po/uk.po b/po/uk.po index 6acf133..01e116b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2160,8 +2160,8 @@ msgstr "" "сертифікатів.\n" "\n" "Сертифікат може бути використаний для вашої ідентифікації або ідентифікації " -"комп'ютера, з яким ви з'єднані. Також він може бути використаний для " -"завірення і для підписуваня повідомлень. Сховищами сертифікатів є колекції " +"комп'ютера, з яким ви з'єднані. Також він може бути використаний для " +"завірення і для підписуваня повідомлень. Сховищами сертифікатів є колекції " "сертифікатів, списки анульованих сертифікатів та списки довірених " "сертифікатів.\n" "\n" @@ -2302,7 +2302,7 @@ msgstr "" "\n" "Сертифікат може бути використаний для вашої ідентифікації або ідентифікації " "комп'ютера, з яким ви з'єднані. Також він може бути використаний для " -"завірення і для підписуваня повідомлень. Сховищами сертифікатів є колекції " +"завірення і для підписуваня повідомлень. Сховищами сертифікатів є колекції " "сертифікатів, списки анульованих сертифікатів та списки довірених " "сертифікатів.\n" "\n"

1 0

Alexandre Julliard : gdi32: Fix GetClipBox return value for non-memory DCs.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 1ca6ed774835187d14a4b536812bb9fb38e57ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca6ed774835187d14a4b5368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 9 15:13:31 2012 +0200 gdi32: Fix GetClipBox return value for non-memory DCs. --- dlls/gdi32/clipping.c | 6 +++++- dlls/gdi32/tests/dc.c | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index ef2dc12..c413e1a 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -409,7 +409,11 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) if (get_dc_visrect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) ret = NULLREGION; } - else ret = get_dc_visrect( dc, rect ) ? SIMPLEREGION : NULLREGION; + else + { + ret = is_rect_empty( &dc->vis_rect ) ? ERROR : SIMPLEREGION; + *rect = dc->vis_rect; + } if (dc->layout & LAYOUT_RTL) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d8276f4..da2c31b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -345,6 +345,8 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) unsigned int i; WORD ramp[3][256]; BOOL ret; + RECT clip; + UINT type; if (GetObjectType( hdc ) == OBJ_METADC) { @@ -358,6 +360,8 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); + type = GetClipBox( hdc, &clip ); + ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); } else { @@ -371,8 +375,17 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); + type = GetClipBox( hdc, &clip ); + ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); } + type = GetClipBox( ref_dc, &clip ); + ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); + ok( clip.left == 0 && clip.top == 0 && + clip.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && + clip.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), + "GetClipBox returned %d,%d,%d,%d on %s\n", clip.left, clip.top, clip.right, clip.bottom, descr ); + if (GetObjectType( hdc ) == OBJ_MEMDC) { char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; @@ -400,6 +413,12 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); + type = GetClipBox( hdc, &clip ); + ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + ok( clip.left == 0 && clip.top == 0 && clip.right == 16 && clip.bottom == 16, + "GetClipBox returned %d,%d,%d,%d on memdc for %s\n", + clip.left, clip.top, clip.right, clip.bottom, descr ); + SelectObject( hdc, old ); DeleteObject( dib ); } @@ -412,7 +431,7 @@ static void test_CreateCompatibleDC(void) HBITMAP bitmap; INT caps; - screen_dc = GetDC( 0 ); + screen_dc = CreateDC( "DISPLAY", NULL, NULL, NULL ); bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); /* Create a DC compatible with the screen */ @@ -456,7 +475,7 @@ static void test_CreateCompatibleDC(void) DeleteMetaFile( CloseMetaFile( hdcMetafile )); DeleteObject( bitmap ); - ReleaseDC( 0, screen_dc ); + DeleteDC( screen_dc ); } static void test_DC_bitmap(void)

1 0

Nicolas Le Cam : configure.ac: Prefer pkg-config over freetype-config.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: a37f74f5adec8cd3f924fc96e083a66219086091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37f74f5adec8cd3f924fc96e… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 7 22:46:58 2012 +0200 configure.ac: Prefer pkg-config over freetype-config. --- configure | 16 +++++++++++----- configure.ac | 14 ++++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 3e6e777..5b0dcba 100755 --- a/configure +++ b/configure @@ -10262,7 +10262,12 @@ fi if test "x$with_freetype" != "xno" then - for ac_prog in freetype-config freetype2-config + if test "$PKG_CONFIG" != "false" + then + ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`" + ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`" + else + for ac_prog in freetype-config freetype2-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -10305,10 +10310,11 @@ fi done test -n "$ft_devel" || ft_devel="no" - if test "$ft_devel" != "no" - then - ac_freetype_incl=`$ft_devel --cflags` - ac_freetype_libs=`$ft_devel --libs` + if test "$ft_devel" != "no" + then + ac_freetype_incl=`$ft_devel --cflags` + ac_freetype_libs=`$ft_devel --libs` + fi fi ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5 diff --git a/configure.ac b/configure.ac index 667d725..a57f133 100644 --- a/configure.ac +++ b/configure.ac @@ -1384,11 +1384,17 @@ WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"], dnl **** Check for FreeType 2 **** if test "x$with_freetype" != "xno" then - AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],no) - if test "$ft_devel" != "no" + if test "$PKG_CONFIG" != "false" then - ac_freetype_incl=`$ft_devel --cflags` - ac_freetype_libs=`$ft_devel --libs` + ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`" + ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`" + else + AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],no) + if test "$ft_devel" != "no" + then + ac_freetype_incl=`$ft_devel --cflags` + ac_freetype_libs=`$ft_devel --libs` + fi fi ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"} WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs])

1 0