Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
7fd9d4d4
Commit
7fd9d4d4
authored
Feb 01, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: x265 0.7
parent
9b5fbb12
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
34 deletions
+2
-34
contrib/src/x265/SHA512SUMS
contrib/src/x265/SHA512SUMS
+1
-1
contrib/src/x265/rules.mak
contrib/src/x265/rules.mak
+1
-2
contrib/src/x265/static-only.patch
contrib/src/x265/static-only.patch
+0
-31
No files found.
contrib/src/x265/SHA512SUMS
View file @
7fd9d4d4
dd58b502d01594d3a7036ff91bfe9bde93914deec91051f15bba4b805cd5f5261ecb58c70b4795f0b83148bd99faf22d4a1cdadd76e25b50aad9668043e894e6 x265-0.6
.tar.bz2
3cabcbe1c2537c9ab83316776a1a7d98aeac3b4f8751422486367f1905b2e96c3755f7f051b9066e4eb5aa6ab0ce1ba6d8807f79df2ed51c6c2b509bac1e888b x265-0.7
.tar.bz2
contrib/src/x265/rules.mak
View file @
7fd9d4d4
# x265
#X265_GITURL := https://github.com/videolan/x265
X265_VERSION
:=
0.
6
X265_VERSION
:=
0.
7
X265_SNAPURL
:=
https://bitbucket.org/multicoreware/x265/get/
$(X265_VERSION)
.tar.bz2
ifdef
BUILD_ENCODERS
...
...
@@ -27,7 +27,6 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
mkdir
-p
$@
-
$(X265_VERSION)
$(BZCAT)
"
$<
"
|
(
cd
$@
-
$(X265_VERSION)
&&
tar
xv
--strip-components
=
1
)
$(
call
pkg_static,
"source/x265.pc.in"
)
$(APPLY)
$(SRC)
/x265/static-only.patch
$(MOVE)
.x265
:
x265 toolchain.cmake
...
...
contrib/src/x265/static-only.patch
deleted
100644 → 0
View file @
9b5fbb12
--- x265/source/CMakeLists.txt.orig 2014-01-13 22:56:15.441726467 +0100
+++ x265/source/CMakeLists.txt 2014-01-13 22:56:36.947787400 +0100
@@ -196,28 +196,15 @@
endif()
add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
-add_library(x265-shared SHARED dllmain.cpp "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS}
- $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
-target_link_libraries(x265-shared ${PLATFORM_LIBS})
-set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
if(NOT MSVC)
set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)
endif()
-if(UNIX AND NOT APPLE)
- set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic")
-endif()
# WIN32 builds static: x265-static.lib shared: x265.dll + x265.lib (shim loader)
# MINGW builds static: libx265-static.a shared: libx265.dll + libx265.dll.a
# *NIX builds static: libx265.a shared: libx265.so
if(X265_LATEST_TAG)
# shared library is not installed if a tag is not found
- set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION ${X265_BUILD})
- install(TARGETS x265-shared
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib)
-
# convert lists of link libraries into -lstdc++ -lm etc..
foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment