← Back to branch summary

~ubuntu-branches/ubuntu/natty/kde4libs/natty-proposed

« back to all changes in this revision

Viewing changes to cmake/modules/FindOggVorbis.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell, Scott Kitterman, Jonathan Riddell
  • Date: 2010-11-22 17:59:02 UTC
  • mfrom: (1.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101122175902-yubxubd0pg6hn11z
Tags: 4:4.5.80a-0ubuntu1
[ Scott Kitterman ]
* New upstream beta release
  - Refreshed all patches
  - Updated debian/patches/10_make_libkdeinit4_private.diff to use Qfile
    instead of Qstring in kdecore/kernel/kstandarddirs_unix.cpp
  - Updated debian/patches/kubuntu_01_kubuntu_useragent.diff to provide
    Kubuntu in the Konqueror user agen string with the changes in
    kio/kio/kprotocolmanager.cpp
  - Partially updated debian/patches/kubuntu_05_langpack_desktop_files.diff
    and left the balance in kdecore/localization/klocale.cpp.rej for later
    revision
  - Update debian/patches/kubuntu_06_user_disk_mounting.diff for changes in
    solid/solid/backends/hal/halstorageaccess.cpp
  - Remove debian/patches/kubuntu_71_backport_plasma_webview_changes.diff
    (backported from upstream, so already present now)
  - Add minimum version for libattica-dev of 0.1.90 to build-depends
  - Bump minimum version for libsoprano-dev build-depend to 2.5.60
  - Add minimum version for shared-desktop-ontologies of 0.5 in build-dep

[ Jonathan Riddell ]
* Add build-depends on grantlee, libudev-dev, hupnp (FIXME needs packaging fixes)
* Update kubuntu_04_add_langpack_path.diff 28_find_old_kde4_html_documentation.diff
  22_hack_in_etc_kde4_in_kstandarddirs.diff for QT_NO_CAST_FROM_ASCII
* Update kubuntu_05_langpack_desktop_files.diff for new upstream code
* Add kubuntu_78_solid_trunk.diff to fix solid linking
* Add libnepomukutils4 package for new library
* Don't install kcm_ssl for now, e-mailed upstream to suggest moving to kdebase
* Add kubuntu_79_knewstuff_fix.diff to fix compile broken by non-trunk commit
  http://websvn.kde.org/?view=revision&revision=1199825
* kdelibs5-data replaces old kdebase-runtime-data due to moved file
* Add kubuntu_80_find_hupnp.diff to find hupnp include files, committed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmake/modules/FindOggVorbis.cmake
31
31
 
32
32
 
33
33
if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
34
 
   set(OGGVORBIS_FOUND TRUE)
35
34
 
36
35
   set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
37
36
 
46
45
      set (OGGVORBIS_VERSION 1)
47
46
   endif (HAVE_LIBVORBISENC2)
48
47
 
49
 
else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
50
 
   set (OGGVORBIS_VERSION)
51
 
   set(OGGVORBIS_FOUND FALSE)
52
48
endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
53
49
 
54
50
 
55
 
if (OGGVORBIS_FOUND)
56
 
   if (NOT OggVorbis_FIND_QUIETLY)
57
 
      message(STATUS "Found OggVorbis: ${OGGVORBIS_LIBRARIES}")
58
 
   endif (NOT OggVorbis_FIND_QUIETLY)
59
 
else (OGGVORBIS_FOUND)
60
 
   if (OggVorbis_FIND_REQUIRED)
61
 
      message(FATAL_ERROR "Could NOT find OggVorbis libraries")
62
 
   endif (OggVorbis_FIND_REQUIRED)
63
 
   if (NOT OggVorbis_FIND_QUITELY)
64
 
      message(STATUS "Could NOT find OggVorbis libraries")
65
 
   endif (NOT OggVorbis_FIND_QUITELY)
66
 
endif (OGGVORBIS_FOUND)
 
51
include(FindPackageHandleStandardArgs)
 
52
find_package_handle_standard_args(OggVorbis REQUIRED_VARS VORBIS_LIBRARY OGG_LIBRARY VORBISFILE_LIBRARY VORBISENC_LIBRARY
 
53
                                                          VORBIS_INCLUDE_DIR OGG_INCLUDE_DIR)
67
54
 
68
55
#check_include_files(vorbis/vorbisfile.h HAVE_VORBISFILE_H)
69
56
#check_library_exists(ogg ogg_page_version "" HAVE_LIBOGG)