diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-01-21 23:25:58 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-01-21 23:25:58 (GMT) |
| commit | 738e42215c342cab6af584aa34322f2a431b804b (patch) | |
| tree | 5775cd8b37f2fb40401b6f9d613f75e97df7d6ce | |
| parent | b9a06d261aad3d3083c7de0a160ac3f47f5e8b39 (diff) | |
| download | mxe-738e42215c342cab6af584aa34322f2a431b804b.zip mxe-738e42215c342cab6af584aa34322f2a431b804b.tar.gz mxe-738e42215c342cab6af584aa34322f2a431b804b.tar.bz2 | |
corrections for package openscenegraph (by Martin Lambers)
| -rw-r--r-- | src/openscenegraph-1-pkg-config.patch | 2 | ||||
| -rw-r--r-- | src/openscenegraph.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/openscenegraph-1-pkg-config.patch b/src/openscenegraph-1-pkg-config.patch index 051fed1..2860524 100644 --- a/src/openscenegraph-1-pkg-config.patch +++ b/src/openscenegraph-1-pkg-config.patch @@ -213,7 +213,7 @@ diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgPlugin +Requires: openscenegraph-osgParticle openscenegraph-osgWidget openscenegraph-osgVolume openscenegraph-osgShadow openscenegraph-osgTerrain openscenegraph-osgFX openscenegraph-osgSim openscenegraph-osgText openscenegraph-osgAnimation openscenegraph-osgViewer openscenegraph-osgDB openscenegraph-osgUtil openscenegraph-osg openthreads +Conflicts: +Libs: -+Libs.private: -L${libdir}/osgPlugins-@OPENSCENEGRAPH_VERSION@ -losgdb_3dc -losgdb_3ds -losgdb_ac -losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds -losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal -losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive -losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 -losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight -losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle -losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext -losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget -losgdb_pic -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp -losgdb_stl -losgdb_svg -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans -losgdb_txf -losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls -lgcrypt -lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype -lgdal -ltiff -lgif -ljasper -ljpeg -liconv -lz -lws2_32 -lwinmm -lwldap32 ++Libs.private: -L${libdir}/osgPlugins-@OPENSCENEGRAPH_VERSION@ -losgdb_3dc -losgdb_3ds -losgdb_ac -losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds -losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal -losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive -losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 -losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight -losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle -losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext -losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget -losgdb_pic -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp -losgdb_stl -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans -losgdb_txf -losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls -lgcrypt -lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype -lgdal -ltiff -lgif -ljasper -ljpeg -liconv -lz -lws2_32 -lwinmm -lwldap32 +Cflags: -I${includedir} diff -uNr OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in --- OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 1970-01-01 01:00:00.000000000 +0100 diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index ac0d1ce..0307007 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -30,6 +30,7 @@ define $(PKG)_BUILD -DCMAKE_C_COMPILER='$(PREFIX)/bin/$(TARGET)-gcc' \ -DCMAKE_INCLUDE_PATH='$(PREFIX)/$(TARGET)/include' \ -DCMAKE_LIB_PATH='$(PREFIX)/$(TARGET)/lib' \ + -DPKG_CONFIG_EXECUTABLE=$(TARGET)-pkg-config \ -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)' \ -DCMAKE_BUILD_TYPE=Release \ -DDYNAMIC_OPENTHREADS=OFF \ |