Date: Tuesday, March 10, 2015 @ 17:01:56
Author: alucryd
Revision: 129015
upgpkg: ppsspp 1.0.1-2
Added:
ppsspp/trunk/ppsspp-ffmpeg.patch
Modified:
ppsspp/trunk/PKGBUILD
Deleted:
ppsspp/trunk/ppsspp-1.0-shared-ffmpeg.patch
ppsspp/trunk/ppsspp.desktop
ppsspp/trunk/ppsspp.install
--------------------------------+
PKGBUILD | 109 +++++++++++++++--------
ppsspp-1.0-shared-ffmpeg.patch | 180 ---------------------------------------
ppsspp-ffmpeg.patch | 180 +++++++++++++++++++++++++++++++++++++++
ppsspp.desktop | 10 --
ppsspp.install | 11 --
5 files changed, 252 insertions(+), 238 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-03-10 14:18:07 UTC (rev 129014)
+++ PKGBUILD 2015-03-10 16:01:56 UTC (rev 129015)
@@ -1,57 +1,92 @@
# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Maintainer: Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Contributor: Ben Reedy <theben...@gmail.com>
+# Contributor: Clement Guerin <geecko....@free.fr>
+# Contributor: Thiago Kenji Okada <thiago.mas...@gmail.com>
-pkgname=ppsspp
+pkgbase=ppsspp
+pkgname=('ppsspp' 'ppsspp-qt')
pkgver=1.0.1
-pkgrel=1
-pkgdesc='PSP emulator written in C++'
+pkgrel=2
+pkgdesc='A PSP emulator written in C++'
arch=('i686' 'x86_64')
url='http://www.ppsspp.org/'
license=('GPL2')
-depends=('zlib' 'sdl2' 'libpng' 'libgl' 'hicolor-icon-theme' 'xdg-utils'
'ffmpeg')
-makedepends=('git' 'cmake' 'mesa' 'mesa-libgl' 'glu' 'chrpath' 'zlib' 'sdl')
-install=ppsspp.install
-source=(git://github.com/hrydgard/ppsspp.git#tag=v$pkgver
- git://github.com/hrydgard/native.git#commit=52ce9c1
- lang::git://github.com/hrydgard/ppsspp-lang.git#commit=52c757e
- ffmpeg::git://github.com/hrydgard/ppsspp-ffmpeg.git#commit=04d6e3e
- git://github.com/Kingcom/armips#commit=a0b878f
- ppsspp-1.0-shared-ffmpeg.patch
- ppsspp.desktop)
-md5sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '0b6265a0ba7c8b7066adbed210a5a5bb'
- 'b70b8b3913079468db3469abeacaa9f6')
+depends=('ffmpeg' 'sdl2')
+makedepends=('cmake' 'git' 'glu' 'qt5-tools')
+source=("git+https://github.com/hrydgard/ppsspp.git#tag=v${pkgver}";
+ 'git+https://github.com/hrydgard/ppsspp-lang.git#commit=52c757e'
+
'ppsspp-native::git+https://github.com/hrydgard/native.git#commit=52ce9c1'
+
'ppsspp-armips::git+https://github.com/Kingcom/armips.git#commit=a0b878f'
+ 'ppsspp-ffmpeg.patch')
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '4d60b99f9e6fe1bb81b2b1b648845f9e76289ba824fcb5e53f2117d0319e086d')
prepare() {
- mkdir build
- cd $pkgname
+ cd ppsspp
- git submodule init
- for submodule in native lang ffmpeg ext/armips; do
- git config submodule.${submodule}.url "$srcdir"/${submodule#*/}
- git submodule update $submodule
+ for submodule in native lang ext/armips; do
+ git submodule init ${submodule}
+ git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
+ git submodule update ${submodule}
done
- patch -p1 -i ../ppsspp-1.0-shared-ffmpeg.patch
+ patch -Np1 -i ../ppsspp-ffmpeg.patch
}
build() {
- cd build
- cmake ../$pkgbase -DCMAKE_BUILD_TYPE=Release
+ cd ppsspp
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. \
+ -DCMAKE_BUILD_TYPE='Release' \
+ -DCMAKE_SKIP_RPATH='TRUE'
make
+
+ cd ..
+
+ if [[ -d build-qt ]]; then
+ rm -rf build-qt
+ fi
+ mkdir build-qt && cd build-qt
+
+ qmake-qt5 CONFIG+='release' CONFIG+='system_ffmpeg' ../Qt/PPSSPPQt.pro
+ make
}
-package() {
- install -Dm755 build/PPSSPPSDL "$pkgdir"/usr/bin/PPSSPPSDL
- chrpath -d "$pkgdir"/usr/bin/PPSSPPSDL
+package_ppsspp() {
+ conflicts=('ppsspp-qt')
- install -d "$pkgdir"/usr/share/ppsspp "$pkgdir"/usr/share/icons/
- cp -r build/assets "$pkgdir"/usr/share/ppsspp/
- cp -r ppsspp/assets/unix-icons/hicolor "$pkgdir"/usr/share/icons/hicolor
+ cd ppsspp/build
- install -Dm644 ppsspp.desktop "$pkgdir"/usr/share/applications/ppsspp.desktop
+ install -dm 755
"${pkgdir}"/usr/{bin,share/{applications,man/man1,pixmaps,ppsspp}}
+ install -m 755 PPSSPPSDL "${pkgdir}"/usr/bin/ppsspp
+ cp -dr --no-preserve='ownership' assets "${pkgdir}"/usr/share/ppsspp/
+ install -m 644 ../assets/unix-icons/icon-512.svg
"${pkgdir}"/usr/share/pixmaps/ppsspp.svg
+ install -m 644 ../debian/ppsspp.desktop "${pkgdir}"/usr/share/applications/
+ install -m 644 ../debian/ppsspp.1 "${pkgdir}"/usr/share/man/man1/
}
+
+package_ppsspp-qt() {
+ depends+=('qt5-base')
+ provides=('ppsspp')
+ conflicts=('ppsspp')
+
+ cd ppsspp/build-qt
+
+ install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,man/man1,pixmaps}}
+ install -m 755 ppsspp "${pkgdir}"/usr/bin/
+ install -m 644 ../assets/unix-icons/icon-512.svg
"${pkgdir}"/usr/share/pixmaps/ppsspp.svg
+ install -m 644 ../debian/ppsspp.desktop "${pkgdir}"/usr/share/applications/
+ install -m 644 ../debian/ppsspp.1 "${pkgdir}"/usr/share/man/man1/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: ppsspp-1.0-shared-ffmpeg.patch
===================================================================
--- ppsspp-1.0-shared-ffmpeg.patch 2015-03-10 14:18:07 UTC (rev 129014)
+++ ppsspp-1.0-shared-ffmpeg.patch 2015-03-10 16:01:56 UTC (rev 129015)
@@ -1,180 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a1a2543..4d19fa4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -394,145 +394,20 @@ add_library(stb_vorbis STATIC
- native/ext/stb_vorbis/stb_vorbis.h)
- include_directories(native/ext/stb_vorbis)
-
--if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
-- if(ANDROID)
-- if(ARMV7)
-- set(PLATFORM_ARCH "android/armv7")
-- elseif(ARM)
-- set(PLATFORM_ARCH "android/arm")
-- elseif(X86)
-- set(PLATFORM_ARCH "android/x86")
-- endif()
-- elseif(BLACKBERRY)
-- set(PLATFORM_ARCH "blackberry/armv7")
-- elseif(IOS)
-- set(PLATFORM_ARCH "ios/universal")
-- elseif(MACOSX)
-- set(PLATFORM_ARCH "macosx/x86_64")
-- elseif(LINUX)
-- if(ARMV7)
-- set(PLATFORM_ARCH "linux/armv7")
-- elseif(ARM)
-- set(PLATFORM_ARCH "linux/arm")
-- elseif(MIPS)
-- set(PLATFORM_ARCH "linux/mips32")
-- elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-- set(PLATFORM_ARCH "linux/x86_64")
-- else()
-- set(PLATFORM_ARCH "linux/x86")
-- endif()
-- endif()
-- # Using static libraries
-- if (DEFINED PLATFORM_ARCH)
-- include_directories(ffmpeg/${PLATFORM_ARCH}/include)
-- link_directories(ffmpeg/${PLATFORM_ARCH}/lib)
-- set(FFMPEG_LIBRARIES libavformat.a libavcodec.a libavutil.a
libswresample.a libswscale.a)
-- else()
-- # Manual definition of system library locations by the user.
-- if (DEFINED FFMPEG_INCLUDE_PATH)
-- include_directories(ffmpeg ${FFMPEG_INCLUDE_PATH})
-- endif()
-- if (DEFINED AVFORMAT_PATH)
-- add_library(libavformat STATIC IMPORTED)
-- set_target_properties(libavformat PROPERTIES
IMPORTED_LOCATION ${AVFORMAT_PATH})
-- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavformat)
-- endif()
-- if (DEFINED AVCODEC_PATH)
-- add_library(libavcodec STATIC IMPORTED)
-- set_target_properties(libavcodec PROPERTIES
IMPORTED_LOCATION ${AVCODEC_PATH})
-- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavcodec)
-- endif()
-- if (DEFINED AVUTIL_PATH)
-- add_library(libavutil STATIC IMPORTED)
-- set_target_properties(libavutil PROPERTIES
IMPORTED_LOCATION ${AVUTIL_PATH})
-- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavutil)
-- endif()
-- if (DEFINED SWRESAMPLE_PATH)
-- add_library(libswresample STATIC IMPORTED)
-- set_target_properties(libswresample PROPERTIES
IMPORTED_LOCATION ${SWRESAMPLE_PATH})
-- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswresample)
-- endif()
-- if (DEFINED SWSCALE_PATH)
-- add_library(libswscale STATIC IMPORTED)
-- set_target_properties(libswscale PROPERTIES
IMPORTED_LOCATION ${SWSCALE_PATH})
-- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswscale)
-- endif()
-- endif(DEFINED PLATFORM_ARCH)
--endif(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
--
- if(USE_FFMPEG)
-- # Using shared libraries
-- if(DEFINED FFMPEG_BUILDDIR)
-- include_directories(ffmpeg ${FFMPEG_BUILDDIR})
--
-- add_library(libavformat STATIC IMPORTED)
-- set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libavformat/libavformat.a)
-- add_library(libavcodec STATIC IMPORTED)
-- set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libavcodec/libavcodec.a)
-- add_library(libavutil STATIC IMPORTED)
-- set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libavutil/libavutil.a)
-- add_library(libswresample STATIC IMPORTED)
-- set_target_properties(libswresample PROPERTIES
IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswresample/libswresample.a)
-- add_library(libswscale STATIC IMPORTED)
-- set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libswscale/libswscale.a)
--
-- SET (FFMPEG_LIBRARIES
-- libavformat
-- libavcodec
-- libavutil
-- libswresample
-- libswscale
-- )
-- endif()
--
-- find_library(ICONV_LIBRARY NAMES iconv)
-- if (ICONV_LIBRARY)
-- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${ICONV_LIBRARY})
-- endif()
--
-- if(APPLE)
-- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} bz2 "-framework
CoreVideo")
-- if (NOT IOS)
-- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} "-framework
VideoDecodeAcceleration")
-- endif()
-- endif(APPLE)
-+ SET (FFMPEG_LIBRARIES
-+ avformat
-+ avcodec
-+ avutil
-+ swresample
-+ swscale
-+ )
-
-- set(LinkCommon ${LinkCommon} ${FFMPEG_LIBRARIES})
-+ set(nativeExtraLibs ${nativeExtraLibs} ${FFMPEG_LIBRARIES})
-+ target_link_libraries(Common ${FFMPEG_LIBRARIES})
- add_definitions(-DUSE_FFMPEG)
- endif(USE_FFMPEG)
-
--# Modification to show where we are pulling the ffmpeg libraries from.
--if(USE_FFMPEG AND DEFINED FFMPEG_LIBRARIES)
-- target_link_libraries(Common ${FFMPEG_LIBRARIES})
-- message(STATUS "FFMPEG library locations:")
-- if(DEFINED PLATFORM_ARCH)
-- set(TEMP ${CMAKE_SOURCE_DIR}/ffmpeg/${PLATFORM_ARCH}/lib)
-- message(STATUS "libavcodec location: ${TEMP}/libavcodec.a")
-- message(STATUS "libavformat location: ${TEMP}/libavformat.a")
-- message(STATUS "libavutil location: ${TEMP}/libavutil.a")
-- message(STATUS "libswresample location:
${TEMP}/libswresample.a")
-- message(STATUS "libswscale location: ${TEMP}/libswscale.a")
-- else()
-- get_target_property(TEMP libavcodec IMPORTED_LOCATION)
-- message(STATUS "libavcodec location: ${TEMP}")
-- get_target_property(TEMP libavformat IMPORTED_LOCATION)
-- message(STATUS "libavformat location: ${TEMP}")
-- get_target_property(TEMP libavutil IMPORTED_LOCATION)
-- message(STATUS "libavutil location: ${TEMP}")
-- get_target_property(TEMP libswresample IMPORTED_LOCATION)
-- message(STATUS "libswresample location: ${TEMP}")
-- get_target_property(TEMP libswscale IMPORTED_LOCATION)
-- message(STATUS "libswscale location: ${TEMP}")
-- endif(DEFINED PLATFORM_ARCH)
--else()
-- message(STATUS "ERROR: No FFMPEG library locations")
--endif()
--
--if(USE_FFMPEG AND NOT DEFINED FFMPEG_LIBRARIES)
-- message(WARNING "FFMPEG_BUILDDIR variable or manual path definition is
required to enable FFmpeg. Disabling it.")
-- unset(USE_FFMPEG)
--endif()
--
- find_package(ZLIB)
- if(ZLIB_FOUND)
- include_directories(${ZLIB_INCLUDE_DIR})
-diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h
-index c384faf..d38993d 100644
---- a/Core/HW/MediaEngine.h
-+++ b/Core/HW/MediaEngine.h
-@@ -34,9 +34,14 @@ class PointerWrap;
- class SimpleAudio;
-
- #ifdef USE_FFMPEG
-+extern "C" {
-+#include <libavformat/avformat.h>
-+#include <libavutil/old_pix_fmts.h>
-+}
-+
- struct SwsContext;
- struct AVFrame;
--struct AVIOContext;
-+//struct AVIOContext;
- struct AVFormatContext;
- struct AVCodecContext;
- #endif
-
Added: ppsspp-ffmpeg.patch
===================================================================
--- ppsspp-ffmpeg.patch (rev 0)
+++ ppsspp-ffmpeg.patch 2015-03-10 16:01:56 UTC (rev 129015)
@@ -0,0 +1,180 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a1a2543..4d19fa4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -394,145 +394,20 @@ add_library(stb_vorbis STATIC
+ native/ext/stb_vorbis/stb_vorbis.h)
+ include_directories(native/ext/stb_vorbis)
+
+-if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
+- if(ANDROID)
+- if(ARMV7)
+- set(PLATFORM_ARCH "android/armv7")
+- elseif(ARM)
+- set(PLATFORM_ARCH "android/arm")
+- elseif(X86)
+- set(PLATFORM_ARCH "android/x86")
+- endif()
+- elseif(BLACKBERRY)
+- set(PLATFORM_ARCH "blackberry/armv7")
+- elseif(IOS)
+- set(PLATFORM_ARCH "ios/universal")
+- elseif(MACOSX)
+- set(PLATFORM_ARCH "macosx/x86_64")
+- elseif(LINUX)
+- if(ARMV7)
+- set(PLATFORM_ARCH "linux/armv7")
+- elseif(ARM)
+- set(PLATFORM_ARCH "linux/arm")
+- elseif(MIPS)
+- set(PLATFORM_ARCH "linux/mips32")
+- elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+- set(PLATFORM_ARCH "linux/x86_64")
+- else()
+- set(PLATFORM_ARCH "linux/x86")
+- endif()
+- endif()
+- # Using static libraries
+- if (DEFINED PLATFORM_ARCH)
+- include_directories(ffmpeg/${PLATFORM_ARCH}/include)
+- link_directories(ffmpeg/${PLATFORM_ARCH}/lib)
+- set(FFMPEG_LIBRARIES libavformat.a libavcodec.a libavutil.a
libswresample.a libswscale.a)
+- else()
+- # Manual definition of system library locations by the user.
+- if (DEFINED FFMPEG_INCLUDE_PATH)
+- include_directories(ffmpeg ${FFMPEG_INCLUDE_PATH})
+- endif()
+- if (DEFINED AVFORMAT_PATH)
+- add_library(libavformat STATIC IMPORTED)
+- set_target_properties(libavformat PROPERTIES
IMPORTED_LOCATION ${AVFORMAT_PATH})
+- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavformat)
+- endif()
+- if (DEFINED AVCODEC_PATH)
+- add_library(libavcodec STATIC IMPORTED)
+- set_target_properties(libavcodec PROPERTIES
IMPORTED_LOCATION ${AVCODEC_PATH})
+- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavcodec)
+- endif()
+- if (DEFINED AVUTIL_PATH)
+- add_library(libavutil STATIC IMPORTED)
+- set_target_properties(libavutil PROPERTIES
IMPORTED_LOCATION ${AVUTIL_PATH})
+- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libavutil)
+- endif()
+- if (DEFINED SWRESAMPLE_PATH)
+- add_library(libswresample STATIC IMPORTED)
+- set_target_properties(libswresample PROPERTIES
IMPORTED_LOCATION ${SWRESAMPLE_PATH})
+- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswresample)
+- endif()
+- if (DEFINED SWSCALE_PATH)
+- add_library(libswscale STATIC IMPORTED)
+- set_target_properties(libswscale PROPERTIES
IMPORTED_LOCATION ${SWSCALE_PATH})
+- SET (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} libswscale)
+- endif()
+- endif(DEFINED PLATFORM_ARCH)
+-endif(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
+-
+ if(USE_FFMPEG)
+- # Using shared libraries
+- if(DEFINED FFMPEG_BUILDDIR)
+- include_directories(ffmpeg ${FFMPEG_BUILDDIR})
+-
+- add_library(libavformat STATIC IMPORTED)
+- set_target_properties(libavformat PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libavformat/libavformat.a)
+- add_library(libavcodec STATIC IMPORTED)
+- set_target_properties(libavcodec PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libavcodec/libavcodec.a)
+- add_library(libavutil STATIC IMPORTED)
+- set_target_properties(libavutil PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libavutil/libavutil.a)
+- add_library(libswresample STATIC IMPORTED)
+- set_target_properties(libswresample PROPERTIES
IMPORTED_LOCATION ${FFMPEG_BUILDDIR}/libswresample/libswresample.a)
+- add_library(libswscale STATIC IMPORTED)
+- set_target_properties(libswscale PROPERTIES IMPORTED_LOCATION
${FFMPEG_BUILDDIR}/libswscale/libswscale.a)
+-
+- SET (FFMPEG_LIBRARIES
+- libavformat
+- libavcodec
+- libavutil
+- libswresample
+- libswscale
+- )
+- endif()
+-
+- find_library(ICONV_LIBRARY NAMES iconv)
+- if (ICONV_LIBRARY)
+- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${ICONV_LIBRARY})
+- endif()
+-
+- if(APPLE)
+- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} bz2 "-framework
CoreVideo")
+- if (NOT IOS)
+- set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} "-framework
VideoDecodeAcceleration")
+- endif()
+- endif(APPLE)
++ SET (FFMPEG_LIBRARIES
++ avformat
++ avcodec
++ avutil
++ swresample
++ swscale
++ )
+
+- set(LinkCommon ${LinkCommon} ${FFMPEG_LIBRARIES})
++ set(nativeExtraLibs ${nativeExtraLibs} ${FFMPEG_LIBRARIES})
++ target_link_libraries(Common ${FFMPEG_LIBRARIES})
+ add_definitions(-DUSE_FFMPEG)
+ endif(USE_FFMPEG)
+
+-# Modification to show where we are pulling the ffmpeg libraries from.
+-if(USE_FFMPEG AND DEFINED FFMPEG_LIBRARIES)
+- target_link_libraries(Common ${FFMPEG_LIBRARIES})
+- message(STATUS "FFMPEG library locations:")
+- if(DEFINED PLATFORM_ARCH)
+- set(TEMP ${CMAKE_SOURCE_DIR}/ffmpeg/${PLATFORM_ARCH}/lib)
+- message(STATUS "libavcodec location: ${TEMP}/libavcodec.a")
+- message(STATUS "libavformat location: ${TEMP}/libavformat.a")
+- message(STATUS "libavutil location: ${TEMP}/libavutil.a")
+- message(STATUS "libswresample location:
${TEMP}/libswresample.a")
+- message(STATUS "libswscale location: ${TEMP}/libswscale.a")
+- else()
+- get_target_property(TEMP libavcodec IMPORTED_LOCATION)
+- message(STATUS "libavcodec location: ${TEMP}")
+- get_target_property(TEMP libavformat IMPORTED_LOCATION)
+- message(STATUS "libavformat location: ${TEMP}")
+- get_target_property(TEMP libavutil IMPORTED_LOCATION)
+- message(STATUS "libavutil location: ${TEMP}")
+- get_target_property(TEMP libswresample IMPORTED_LOCATION)
+- message(STATUS "libswresample location: ${TEMP}")
+- get_target_property(TEMP libswscale IMPORTED_LOCATION)
+- message(STATUS "libswscale location: ${TEMP}")
+- endif(DEFINED PLATFORM_ARCH)
+-else()
+- message(STATUS "ERROR: No FFMPEG library locations")
+-endif()
+-
+-if(USE_FFMPEG AND NOT DEFINED FFMPEG_LIBRARIES)
+- message(WARNING "FFMPEG_BUILDDIR variable or manual path definition is
required to enable FFmpeg. Disabling it.")
+- unset(USE_FFMPEG)
+-endif()
+-
+ find_package(ZLIB)
+ if(ZLIB_FOUND)
+ include_directories(${ZLIB_INCLUDE_DIR})
+diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h
+index c384faf..d38993d 100644
+--- a/Core/HW/MediaEngine.h
++++ b/Core/HW/MediaEngine.h
+@@ -34,9 +34,14 @@ class PointerWrap;
+ class SimpleAudio;
+
+ #ifdef USE_FFMPEG
++extern "C" {
++#include <libavformat/avformat.h>
++#include <libavutil/old_pix_fmts.h>
++}
++
+ struct SwsContext;
+ struct AVFrame;
+-struct AVIOContext;
++//struct AVIOContext;
+ struct AVFormatContext;
+ struct AVCodecContext;
+ #endif
+
Deleted: ppsspp.desktop
===================================================================
--- ppsspp.desktop 2015-03-10 14:18:07 UTC (rev 129014)
+++ ppsspp.desktop 2015-03-10 16:01:56 UTC (rev 129015)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=PPSSPP
-GenericName=PSP Emulator
-Comment=Playstation Portable Emulator
-Exec=PPSSPPSDL %f
-Terminal=false
-Type=Application
-Icon=ppsspp
-Categories=Application;Game;
-StartupNotify=false
Deleted: ppsspp.install
===================================================================
--- ppsspp.install 2015-03-10 14:18:07 UTC (rev 129014)
+++ ppsspp.install 2015-03-10 16:01:56 UTC (rev 129015)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
