From 383d71db60dd1a5d1297464da4816218f14b32b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= Date: Fri, 19 Sep 2008 22:06:48 +0000 Subject: [PATCH] net-im/qutecom: first attempt at fixing the build with ffmpeg-20080326 svn path=/sunrise/; revision=7127 --- net-im/qutecom/ChangeLog | 5 + net-im/qutecom/Manifest | 6 +- .../qutecom/files/qutecom-newerffmpeg0.patch | 223 ++++++++++++++++++ .../qutecom/files/qutecom-newerffmpeg1.patch | 160 +++++++++++++ net-im/qutecom/qutecom-2.2_rc1-r1.ebuild | 3 +- 5 files changed, 394 insertions(+), 3 deletions(-) create mode 100644 net-im/qutecom/files/qutecom-newerffmpeg0.patch create mode 100644 net-im/qutecom/files/qutecom-newerffmpeg1.patch diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog index a94ee2324..7a317c647 100644 --- a/net-im/qutecom/ChangeLog +++ b/net-im/qutecom/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Sep 2008; Chi-Thanh Christopher Nguyen (chithead) + +files/qutecom-newerffmpeg0.patch, + qutecom-2.2_rc1-r1.ebuild, +files/qutecom-newerffmpeg1.patch: + first attempt at fixing the build with ffmpeg-20080326 + 19 Sep 2008; Chi-Thanh Christopher Nguyen (chithead) qutecom-2.2_rc1-r1.ebuild: fix wrong domenu/doicon path diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest index 059a407b3..55cefd643 100644 --- a/net-im/qutecom/Manifest +++ b/net-im/qutecom/Manifest @@ -2,8 +2,10 @@ AUX qutecom-boost-1.35.patch 627 RMD160 758262f720f3d4b303ee40d5f22b5b984009792d AUX qutecom-cmake-hg-svnrevision.patch 1132 RMD160 60de7a9bd0f7b4ef2e40e822472135f6d7946540 SHA1 a85f0444ccd97fa40dc60a5be139e64b7cc05067 SHA256 01b4f7c725bc3e65b68225642841c6895061c7726231632e72abcd30a9b51da3 AUX qutecom-cstdlib-include.patch 371 RMD160 b2bf62fba4de1c384b6e2d586aea0171ba04d2af SHA1 cba8bdff1395c2e9396e244848ef9e729ad16b2e SHA256 ace997b0049720714bf538b564597a5ba755ff3408023042fe11d15bb8e900ad AUX qutecom-gcc-4.3-switch-enum.patch 892 RMD160 89bb4421383bb263b65b302f3909edc9c250d467 SHA1 b8ee70f9f28dec35cb3bb324586872ba2b0ce666 SHA256 db5da9b715991dab954bce5cd8970dabec2cc8700540363ce1aac4242f958ce3 +AUX qutecom-newerffmpeg0.patch 5701 RMD160 4b81c76e8f0d051c09c2fb00398800ef79ac9e1d SHA1 24067b1b1ccd0156568943af12a567b6c0f5d6f3 SHA256 60f77ce35c01bd2a050a430d91cd9cbdd2c2fc177d94b0c869d6f9f50086b021 +AUX qutecom-newerffmpeg1.patch 4113 RMD160 a32916f7ad640fdf58581104fae2f8708e1d886d SHA1 67048410246512c6e92b7c24ad971804ce90d918 SHA256 cea60759770abaa03474ccd8b4bc7501a17fcaf7f2074468e292429b0194a626 AUX qutecom-types.h.patch 345 RMD160 3e847c147ee686933d87bfde97b57b1d12d74898 SHA1 fdae61a25fdbc3cad0a0e6f3b3857456ca8acc4d SHA256 b65cca74d41d941aff7467cf1f0ad863b5d504f74b80378bf65457cf1ab114c4 DIST qutecom-2.2-RC1.tar.gz 43137488 RMD160 33ce9c89660699547c9bfc3dbd77051862622a34 SHA1 fc8dd06339a03806611d93a66c98450d584fbebf SHA256 ec729be2eec6704f11401b4e0f3a2356e884b3d20702ebd3419cf02c197e8eaf -EBUILD qutecom-2.2_rc1-r1.ebuild 1623 RMD160 633e19fc4eb8fb9eb8dc678c9b7678787d4d9f1d SHA1 afb916996ca127a717d3f87debbd55ebb71220a3 SHA256 47ff4330c948f7ea4820766398314fe0b6e66691d5727d87ec31be4322564c27 -MISC ChangeLog 959 RMD160 ca2ca2349a785a23b17adb66de8b7318c40a9449 SHA1 08e318f62db0398737e1ab15e52cf53d500031b2 SHA256 06db77a64a0421991560cb10573dada08c2248a7e45a94954db4f552d8792ea8 +EBUILD qutecom-2.2_rc1-r1.ebuild 1662 RMD160 946b920b81bcf66b7b5dfc7cf77f71bd137b7d9e SHA1 d63fe214efbbda21c05addde3adc84c91616169a SHA256 a9443b72a064c1b3c6fa5d0ca773a9b54ead04ea6a735d101f2b0074244db229 +MISC ChangeLog 1200 RMD160 4ec263e7ad01a67fb32286f04d18323d14984354 SHA1 a8bf6d02ccf6bed4f01226d6c3d2833c36f28d27 SHA256 576872e941e49c5abfa8c764d5835b7b86f29e9002e1c2bb0de4d814189831a5 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-im/qutecom/files/qutecom-newerffmpeg0.patch b/net-im/qutecom/files/qutecom-newerffmpeg0.patch new file mode 100644 index 000000000..1fe9ecb27 --- /dev/null +++ b/net-im/qutecom/files/qutecom-newerffmpeg0.patch @@ -0,0 +1,223 @@ + +# HG changeset patch +# User Andreas Schneider +# Date 1220517197 -7200 +# Node ID 7e84723fb577d1540fb0bbde7f93c7d54d868df9 +# Parent 828dba0b9bf0f0789a13e28ca0b3b9626a0a5c54 +Improve the FFMPEG module. + +--- a/owbuild/FindFFMPEG.cmake Thu Sep 04 10:33:44 2008 +0200 ++++ b/owbuild/FindFFMPEG.cmake Thu Sep 04 10:33:17 2008 +0200 +@@ -1,12 +1,12 @@ +-# - Try to find FFmpeg ++# - Try to find FFMPEG + # Once done this will define + # +-# FFMPEG_FOUND - system has FFmpeg +-# FFMPEG_INCLUDE_DIRS - the FFmpeg include directory +-# FFMPEG_LIBRARIES - Link these to use FFmpeg +-# FFMPEG_DEFINITIONS - Compiler switches required for using FFmpeg ++# FFMPEG_FOUND - system has FFMPEG ++# FFMPEG_INCLUDE_DIRS - the FFMPEG include directory ++# FFMPEG_LIBRARIES - Link these to use FFMPEG ++# FFMPEG_DEFINITIONS - Compiler switches required for using FFMPEG + # +-# Copyright (c) 2006 Andreas Schneider ++# Copyright (c) 2008 Andreas Schneider + # + # Redistribution and use is allowed according to the terms of the New + # BSD license. +@@ -20,18 +20,21 @@ + else (FFMPEG_LIBRARIES AND FFMPEG_INCLUDE_DIRS) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls +- include(UsePkgConfig) +- include(CheckFunctionExists) +- +- pkgconfig(libavcodec _FFMPEGIncDir _FFMPEGLinkDir _FFMPEGLinkFlags _FFMPEGCflags) +- +- set(FFMPEG_DEFINITIONS ${_FFMPEGCflags}) ++ if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) ++ include(UsePkgConfig) ++ pkgconfig(libavcodec _FFMPEG_INCLUDEDIR _FFMPEG_LIBDIR _FFMPEG_LDFLAGS _FFMPEG_CFLAGS) ++ else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) ++ find_package(PkgConfig) ++ if (PKG_CONFIG_FOUND) ++ pkg_check_modules(_FFMPEG libavcodec) ++ endif (PKG_CONFIG_FOUND) ++ endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + + find_path(FFMPEG_INCLUDE_DIR + NAMES + avcodec.h + PATHS +- ${_FFMPEGIncDir} ++ ${_FFMPEG_INCLUDEDIR} + /usr/include + /usr/local/include + /opt/local/include +@@ -39,89 +42,114 @@ + PATH_SUFFIXES + ffmpeg + ) ++ mark_as_advanced(FFMPEG_INCLUDE_DIR) + +- find_library(AVUTIL_LIBRARY ++ find_library(AVCODEC_LIBRARY + NAMES +- avutil ++ avcodec + PATHS +- ${_FFMPEGLinkDir} ++ ${_FFMPEG_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) +- +- find_library(AVCODEC_LIBRARY ++ mark_as_advanced(AVCODEC_LIBRARY) ++ find_library(AVUTIL_LIBRARY + NAMES +- avcodec ++ avutil + PATHS +- ${_FFMPEGLinkDir} ++ ${_FFMPEG_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) +- ++ mark_as_advanced(AVUTIL_LIBRARY) + find_library(AVFORMAT_LIBRARY + NAMES + avformat + PATHS +- ${_FFMPEGLinkDir} ++ ${_FFMPEG_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) +- +- find_library(SWSCALE_LIBRARY ++ mark_as_advanced(AVFORMAT_LIBRARY) ++ find_library(POSTPROC_LIBRARY + NAMES +- swscale ++ postproc + PATHS +- ${_FFMPEGLinkDir} ++ ${_FFMPEG_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) ++ mark_as_advanced(POSTPROC_LIBRARY) ++ find_library(SWSCALE_LIBRARY ++ NAMES ++ swscale ++ PATHS ++ ${_FFMPEG_LIBDIR} ++ /usr/lib ++ /usr/local/lib ++ /opt/local/lib ++ /sw/lib ++ ) ++ mark_as_advanced(SWSCALE_LIBRARY) ++ ++ if (AVCODEC_LIBRARY) ++ set(AVCODEC_FOUND TRUE) ++ endif (AVCODEC_LIBRARY) ++ if (AVUTIL_LIBRARY) ++ set(AVUTIL_FOUND TRUE) ++ endif (AVUTIL_LIBRARY) ++ if (AVFORMAT_LIBRARY) ++ set(AVFORMAT_FOUND TRUE) ++ endif (AVFORMAT_LIBRARY) ++ if (POSTPROC_LIBRARY) ++ set(POSTPROC_FOUND TRUE) ++ endif (POSTPROC_LIBRARY) ++ if (SWSCALE_LIBRARY) ++ set(SWSCALE_FOUND TRUE) ++ endif (SWSCALE_LIBRARY) + + set(FFMPEG_INCLUDE_DIRS + ${FFMPEG_INCLUDE_DIR} + ) + +- set(FFMPEG_LIBRARIES) +- +- if (AVUTIL_LIBRARY) ++ if (AVCODEC_FOUND) ++ set(FFMPEG_LIBRARIES ++ ${FFMPEG_LIBRARIES} ++ ${AVCODEC_LIBRARY} ++ ) ++ endif (AVCODEC_FOUND) ++ if (AVUTIL_FOUND) + set(FFMPEG_LIBRARIES + ${FFMPEG_LIBRARIES} + ${AVUTIL_LIBRARY} + ) +- endif (AVUTIL_LIBRARY) +- +- if (AVCODEC_LIBRARY) +- set(FFMPEG_LIBRARIES +- ${FFMPEG_LIBRARIES} +- ${AVCODEC_LIBRARY} +- ) +- endif (AVCODEC_LIBRARY) +- +- if (AVFORMAT_LIBRARY) ++ endif (AVUTIL_FOUND) ++ if (AVFORMAT_FOUND) + set(FFMPEG_LIBRARIES + ${FFMPEG_LIBRARIES} + ${AVFORMAT_LIBRARY} + ) +- endif (AVFORMAT_LIBRARY) +- +- if (SWSCALE_LIBRARY) ++ endif (AVFORMAT_FOUND) ++ if (POSTPROC_FOUND) ++ set(FFMPEG_LIBRARIES ++ ${FFMPEG_LIBRARIES} ++ ${POSTPROC_LIBRARY} ++ ) ++ endif (POSTPROC_FOUND) ++ if (SWSCALE_FOUND) + set(FFMPEG_LIBRARIES + ${FFMPEG_LIBRARIES} + ${SWSCALE_LIBRARY} + ) +- set(CMAKE_REQUIRED_INCLUDES ${FFMPEG_INCLUDE_DIR}) +- set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES}) +- check_function_exists( +- sws_scale HAVE_SWSCALE +- ) +- endif (SWSCALE_LIBRARY) ++ endif (SWSCALE_FOUND) + + if (FFMPEG_INCLUDE_DIRS AND FFMPEG_LIBRARIES) + set(FFMPEG_FOUND TRUE) +@@ -129,11 +157,11 @@ + + if (FFMPEG_FOUND) + if (NOT FFMPEG_FIND_QUIETLY) +- message(STATUS "Found FFmpeg: ${FFMPEG_LIBRARIES}") ++ message(STATUS "Found FFMPEG: ${FFMPEG_LIBRARIES}") + endif (NOT FFMPEG_FIND_QUIETLY) + else (FFMPEG_FOUND) + if (FFMPEG_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find FFmpeg") ++ message(FATAL_ERROR "Could not find FFMPEG") + endif (FFMPEG_FIND_REQUIRED) + endif (FFMPEG_FOUND) + + diff --git a/net-im/qutecom/files/qutecom-newerffmpeg1.patch b/net-im/qutecom/files/qutecom-newerffmpeg1.patch new file mode 100644 index 000000000..60a837c4b --- /dev/null +++ b/net-im/qutecom/files/qutecom-newerffmpeg1.patch @@ -0,0 +1,160 @@ + +# HG changeset patch +# User Andreas Schneider +# Date 1220969337 -7200 +# Node ID 3798b0f8c2aae18920ec054f346b193cb202aaa8 +# Parent a801e6e669ad3c40c27fec20310bc1e841764d75 +Improve FFMPEG find module for new include dir structure. + +Older versions will stil be found too. + +--- a/owbuild/FindFFMPEG.cmake Wed Sep 10 13:46:28 2008 +0200 ++++ b/owbuild/FindFFMPEG.cmake Tue Sep 09 16:08:57 2008 +0200 +@@ -22,27 +22,96 @@ + # in the FIND_PATH() and FIND_LIBRARY() calls + if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + include(UsePkgConfig) +- pkgconfig(libavcodec _FFMPEG_INCLUDEDIR _FFMPEG_LIBDIR _FFMPEG_LDFLAGS _FFMPEG_CFLAGS) ++ pkgconfig(libavcodec _AVCODEC_INCLUDEDIR _AVCODEC_LIBDIR _AVCODEC_LDFLAGS _AVCODEC_CFLAGS) ++ pkgconfig(libavformat _AVFORMAT_INCLUDEDIR _AVFORMAT_LIBDIR _AVFORMAT_LDFLAGS _AVFORMAT_CFLAGS) ++ pkgconfig(libavutil _AVUTIL_INCLUDEDIR _AVUTIL_LIBDIR _AVUTIL_LDFLAGS _AVUTIL_CFLAGS) ++ pkgconfig(libpostproc _POSTPROC_INCLUDEDIR _POSTPROC_LIBDIR _POSTPROC_LDFLAGS _POSTPROC_CFLAGS) ++ pkgconfig(libswscale _SWSCALE_INCLUDEDIR _SWSCALE_LIBDIR _SWSCALE_LDFLAGS _SWSCALE_CFLAGS) + else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(_FFMPEG libavcodec) ++ pkg_check_modules(_AVCODEC libavcodec) ++ pkg_check_modules(_AVFORMAT libavformat) ++ pkg_check_modules(_AVUTIL libavutil) ++ pkg_check_modules(_POSTPROC libpostproc) ++ pkg_check_modules(_SWSCALE libswscale) + endif (PKG_CONFIG_FOUND) + endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + +- find_path(FFMPEG_INCLUDE_DIR ++ find_path(AVCODEC_INCLUDE_DIR + NAMES + avcodec.h + PATHS +- ${_FFMPEG_INCLUDEDIR} ++ ${_AVCODEC_INCLUDEDIR} + /usr/include + /usr/local/include + /opt/local/include + /sw/include + PATH_SUFFIXES ++ libavcodec + ffmpeg + ) +- mark_as_advanced(FFMPEG_INCLUDE_DIR) ++ mark_as_advanced(AVCODEC_INCLUDE_DIR) ++ ++ find_path(AVUTIL_INCLUDE_DIR ++ NAMES ++ avutil.h ++ PATHS ++ ${_AVUTIL_INCLUDEDIR} ++ /usr/include ++ /usr/local/include ++ /opt/local/include ++ /sw/include ++ PATH_SUFFIXES ++ libavutil ++ ffmpeg ++ ) ++ mark_as_advanced(AVUTIL_INCLUDE_DIR) ++ ++ find_path(AVFORMAT_INCLUDE_DIR ++ NAMES ++ avformat.h ++ PATHS ++ ${_AVFORMAT_INCLUDEDIR} ++ /usr/include ++ /usr/local/include ++ /opt/local/include ++ /sw/include ++ PATH_SUFFIXES ++ libavformat ++ ffmpeg ++ ) ++ mark_as_advanced(AVFORMAT_INCLUDE_DIR) ++ ++ find_path(POSTPROC_INCLUDE_DIR ++ NAMES ++ postprocess.h ++ PATHS ++ ${_POSTPROC_INCLUDEDIR} ++ /usr/include ++ /usr/local/include ++ /opt/local/include ++ /sw/include ++ PATH_SUFFIXES ++ libpostproc ++ ffmpeg ++ ) ++ mark_as_advanced(POSTPROC_INCLUDE_DIR) ++ ++ find_path(SWSCALE_INCLUDE_DIR ++ NAMES ++ swscale.h ++ PATHS ++ ${_SWCALE_INCLUDEDIR} ++ /usr/include ++ /usr/local/include ++ /opt/local/include ++ /sw/include ++ PATH_SUFFIXES ++ libswscale ++ ffmpeg ++ ) ++ mark_as_advanced(SWSCALE_INCLUDE_DIR) + + find_library(AVCODEC_LIBRARY + NAMES +@@ -55,6 +124,7 @@ + /sw/lib + ) + mark_as_advanced(AVCODEC_LIBRARY) ++ + find_library(AVUTIL_LIBRARY + NAMES + avutil +@@ -66,6 +136,7 @@ + /sw/lib + ) + mark_as_advanced(AVUTIL_LIBRARY) ++ + find_library(AVFORMAT_LIBRARY + NAMES + avformat +@@ -77,6 +148,7 @@ + /sw/lib + ) + mark_as_advanced(AVFORMAT_LIBRARY) ++ + find_library(POSTPROC_LIBRARY + NAMES + postproc +@@ -88,6 +160,7 @@ + /sw/lib + ) + mark_as_advanced(POSTPROC_LIBRARY) ++ + find_library(SWSCALE_LIBRARY + NAMES + swscale +@@ -117,7 +190,11 @@ + endif (SWSCALE_LIBRARY) + + set(FFMPEG_INCLUDE_DIRS +- ${FFMPEG_INCLUDE_DIR} ++ ${AVCODEC_INCLUDE_DIR} ++ ${AVFORMAT_INCLUDE_DIR} ++ ${AVUTIL_INCLUDE_DIR} ++ ${POSTPROC_INCLUDE_DIR} ++ ${SWSCALE_INCLUDE_DIR} + ) + + if (AVCODEC_FOUND) + diff --git a/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild b/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild index 558d88146..6419efd21 100644 --- a/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild +++ b/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild @@ -42,7 +42,8 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-types.h.patch epatch "${FILESDIR}"/${PN}-cstdlib-include.patch epatch "${FILESDIR}"/${PN}-gcc-4.3-switch-enum.patch - epatch "${FILESDIR}"/${PN}-cmake-hg-svnrevision.patch + epatch "${FILESDIR}"/${PN}-newerffmpeg0.patch + epatch "${FILESDIR}"/${PN}-newerffmpeg1.patch } src_compile() { -- 2.43.2