diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-16 14:53:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 14:53:09 -0800 |
| commit | b0bb4144cf8e6b8536ef948b8170327547edc1c5 (patch) | |
| tree | 1132edf4f706c1cddbdf13893b7e0fffdaf14af1 | |
| parent | b76360e4af4b84f97180312c3eb6fd43a15a413a (diff) | |
| parent | 5fdda7b89f3de800978d3b1a3ebb6b4148788643 (diff) | |
| download | vcpkg-b0bb4144cf8e6b8536ef948b8170327547edc1c5.tar.gz vcpkg-b0bb4144cf8e6b8536ef948b8170327547edc1c5.zip | |
Merge pull request #2565 from crackedmind/fix_x86_mpg123
[mpg123] Fix x86 build
| -rw-r--r-- | ports/mpg123/0002-fix-x86-build.patch | 24 | ||||
| -rw-r--r-- | ports/mpg123/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mpg123/portfile.cmake | 4 |
3 files changed, 28 insertions, 2 deletions
diff --git a/ports/mpg123/0002-fix-x86-build.patch b/ports/mpg123/0002-fix-x86-build.patch new file mode 100644 index 000000000..d7d3887b7 --- /dev/null +++ b/ports/mpg123/0002-fix-x86-build.patch @@ -0,0 +1,24 @@ +diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h +index 6012ccc..bf37cd7 100644 +--- a/src/libmpg123/mangle.h ++++ b/src/libmpg123/mangle.h +@@ -85,6 +85,10 @@ + #define ASM_VALUE(a) MANGLE_MACROCAT($,a) + #endif + ++#if defined(_WIN32) && !defined(_WIN64) ++#define OPT_X86 ++#endif ++ + /* Enable position-independent code for certain platforms. */ + + #if defined(OPT_X86) +@@ -130,7 +134,7 @@ Lpic_base: \ + /* Dummies for everyone else. */ + #define LOCAL_VAR(a) a + #define GLOBAL_VAR ASM_NAME +-#define GLOBAL_VAR_PTR(a) #error Cannot use indirect addressing in non-PIC object. ++#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object. + #define FUNC ASM_NAME + #define EXTERNAL_FUNC ASM_NAME + #define GET_GOT diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL index b742b0a08..f64ae5c56 100644 --- a/ports/mpg123/CONTROL +++ b/ports/mpg123/CONTROL @@ -1,3 +1,3 @@ Source: mpg123 -Version: 1.25.8 +Version: 1.25.8-1 Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
\ No newline at end of file diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 07dd1b3f0..891542f00 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -31,7 +31,9 @@ set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}") vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CURRENT_PORT_DIR}/0001-fix-crt-linking.patch") + PATCHES + "${CURRENT_PORT_DIR}/0001-fix-crt-linking.patch" + "${CURRENT_PORT_DIR}/0002-fix-x86-build.patch") vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj |