Skip to content

Commit 9697ab3

Browse files
committed
changed: split up libCEC, .Net implementations, driver and build scripts
updated README files. thanks @xdissent for the input for Windows .Net code has been moved to https://github.com/Pulse-Eight/cec-dotnet build scripts have been moved to https://github.com/Pulse-Eight/libcec-support
1 parent c559955 commit 9697ab3

File tree

112 files changed

+363
-34879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+363
-34879
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/platform"]
22
path = src/platform
33
url = https://github.com/Pulse-Eight/platform
4+
[submodule "support"]
5+
path = support
6+
url = https://github.com/Pulse-Eight/libcec-support.git

CMakeLists.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(libcec)
22
cmake_minimum_required(VERSION 2.8.9)
33

44
set(LIBCEC_VERSION_MAJOR 3)
5-
set(LIBCEC_VERSION_MINOR 1)
5+
set(LIBCEC_VERSION_MINOR 2)
66
set(LIBCEC_VERSION_PATCH 0)
77

88
# cec-client
@@ -27,10 +27,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/version.h.in
2727
if(WIN32)
2828
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/project/LibCecSharp/LibCecSharp.rc.in
2929
${CMAKE_CURRENT_SOURCE_DIR}/project/LibCecSharp/LibCecSharp.rc)
30-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/CecSharpTester/Properties/AssemblyInfo.cs.in
31-
${CMAKE_CURRENT_SOURCE_DIR}/src/CecSharpTester/Properties/AssemblyInfo.cs)
3230
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/LibCecSharp/AssemblyInfo.cpp.in
3331
${CMAKE_CURRENT_SOURCE_DIR}/src/LibCecSharp/AssemblyInfo.cpp)
34-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/LibCecTray/Properties/AssemblyInfo.cs.in
35-
${CMAKE_CURRENT_SOURCE_DIR}/src/LibCecTray/Properties/AssemblyInfo.cs)
32+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/project/libCEC-version.nsh.in
33+
${CMAKE_CURRENT_SOURCE_DIR}/project/libCEC-version.nsh)
3634
endif()

README.md

+12-155
Original file line numberDiff line numberDiff line change
@@ -1,182 +1,39 @@
11
# About
2-
32
This library provides support for Pulse-Eight's USB-CEC adapter and other CEC capable hardware, like the Raspberry Pi.
43

5-
You can find a list of frequently asked questions on [libCEC's FAQ page] (http://libcec.pulse-eight.com/faq)
4+
A list of frequently asked questions can be found on [libCEC's FAQ page] (http://libcec.pulse-eight.com/faq).
5+
6+
This project only contains libCEC, LibCecSharp and the Python wrapper now.
7+
Client applications, previously part of this repository, have been moved to [this repository](https://github.com/Pulse-Eight/cec-utils).
68

79
# Supported platforms
810

911
## Linux & BSD
10-
11-
### Prerequisites
12-
libCEC needs the following dependencies in order to work correctly:
13-
* [p8-platform] (https://github.com/Pulse-Eight/platform) 2.0 or later
14-
* udev v151 or later
15-
* cdc-acm support compiled into the kernel or available as module
16-
* [liblockdev] (https://packages.debian.org/search?keywords=liblockdev) 1.0 or later
17-
18-
To compile libCEC on Linux, you'll need the following dependencies:
19-
* [cmake 2.6 or better] (http://www.cmake.org/)
20-
* a supported C++ 11 compiler
21-
* [liblockdev] (https://packages.debian.org/search?keywords=liblockdev) 1.0 development headers
22-
23-
The following dependencies are recommended. Without them, the adapter can not
24-
be (fully) auto-detected.
25-
* pkg-config
26-
* udev development headers v151 or later
27-
* X randr development headers
28-
29-
### Compilation
30-
To compile libCEC on a new Debian/Ubuntu installation, follow these instructions:
31-
```
32-
apt-get update
33-
apt-get install cmake liblockdev1-dev libudev-dev libxrandr-dev python-dev swig
34-
cd
35-
git clone https://github.com/Pulse-Eight/platform.git
36-
mkdir platform/build
37-
cd platform/build
38-
cmake ..
39-
make
40-
sudo make install
41-
cd
42-
git clone https://github.com/Pulse-Eight/libcec.git
43-
mkdir libcec/build
44-
cd libcec/build
45-
cmake ..
46-
make -j4
47-
sudo make install
48-
sudo ldconfig
49-
```
12+
See [docs/README.linux.md](docs/README.linux.md).
5013

5114
### Raspberry Pi
52-
If you're compiling for a Raspberry Pi, then the path to the required headers and libraries can be set manually, in case it's not in a standard system directory:
53-
```
54-
cmake -DRPI_INCLUDE_DIR=/path/to/vc/include \
55-
-DRPI_LIB_DIR=/path/to/vc/lib \
56-
..
57-
```
58-
59-
If you're cross compiling, then you can set the correct toolchain like this (for the Raspberry Pi):
60-
```
61-
cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/CrossCompile.cmake \
62-
-DXCOMPILE_BASE_PATH=/path/to/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi \
63-
-DXCOMPILE_LIB_PATH=/path/to/firmware/hardfp/opt/vc/lib \
64-
-DRPI_INCLUDE_DIR=/path/to/firmware/hardfp/opt/vc/include \
65-
-DRPI_LIB_DIR=/path/to/firmware/hardfp/opt/vc/lib \
66-
..
67-
```
68-
69-
To compile libCEC on a new Raspbian installation, follow these instructions:
70-
```
71-
sudo apt-get update
72-
sudo apt-get install cmake liblockdev1-dev libudev-dev libxrandr-dev python-dev swig
73-
cd
74-
git clone https://github.com/Pulse-Eight/platform.git
75-
mkdir platform/build
76-
cd platform/build
77-
cmake ..
78-
make
79-
sudo make install
80-
cd
81-
git clone https://github.com/Pulse-Eight/libcec.git
82-
mkdir libcec/build
83-
cd libcec/build
84-
cmake -DRPI_INCLUDE_DIR=/opt/vc/include -DRPI_LIB_DIR=/opt/vc/lib ..
85-
make -j4
86-
sudo make install
87-
sudo ldconfig
88-
```
15+
See [docs/README.raspberrypi.md](docs/README.raspberrypi.md).
8916

9017
### Exynos
91-
To compile in support for Exynos devices, you have to pass the argument -DHAVE_EXYNOS_API=1 to cmake:
18+
Follow the instructions in [docs/README.linux.md](docs/README.linux.md) and pass the argument -DHAVE_EXYNOS_API=1 to cmake:
9219
```
9320
cmake -DHAVE_EXYNOS_API=1 ..
9421
```
9522

9623
### TDA995x
97-
To compile in support for TDA995x devices, you have to pass the argument -DHAVE_TDA995X_API=1 to cmake:
24+
Follow the instructions in [docs/README.linux.md](docs/README.linux.md) and pass the argument -DHAVE_TDA995X_API=1 to cmake:
9825
```
9926
cmake -DHAVE_TDA995X_API=1 ..
10027
```
10128

10229
### Debian
103-
Use the following commands to create a debian package:
104-
```
105-
source /etc/lsb-release
106-
sed "s/#DIST#/${DISTRIB_CODENAME}/g" debian/changelog.in > debian/changelog
107-
dpkg-buildpackage
108-
```
30+
See [docs/README.debian.md](docs/README.debian.md).
10931

11032
## Apple OS X
111-
112-
### Prerequisites
113-
To compile libCEC on OS X, you'll need the following dependencies:
114-
* [p8-platform] (https://github.com/Pulse-Eight/platform) 2.0 or later
115-
* [cmake 2.6 or better] (http://www.cmake.org/)
116-
* a supported C++ 11 compiler
117-
* xcode 3.2.6 or later
118-
119-
### Compilation
120-
To compile, execute the following command:
121-
```
122-
mkdir build
123-
cd build
124-
cmake ..
125-
make
126-
sudo make install
127-
```
128-
129-
_Note:_ You may need to copy pkg.m4 to your m4 sources directory
33+
See [docs/README.osx.md](docs/README.osx.md).
13034

13135
## Microsoft Windows
132-
133-
### Prerequisites
134-
To compile libCEC on Windows, you'll need the following dependencies:
135-
* [p8-platform] (https://github.com/Pulse-Eight/platform) 2.0 or later
136-
* [cmake 2.6 or better] (http://www.cmake.org/)
137-
* [Visual Studio 2013] (https://www.visualstudio.com/)
138-
* [Windows DDK (Driver Development Kit)] (https://msdn.microsoft.com/en-us/windows/hardware/hh852365.aspx)
139-
* To create an installer, you'll need [Nullsoft's NSIS] (http://nsis.sourceforge.net/)
140-
141-
When compiling LibCecSharp, you'll need the following versions too:
142-
* Visual Studio 2012
143-
* Visual Studio 2010
144-
* Visual Studio 2008
145-
146-
### Compilation
147-
To compile libCEC, follow these instructions:
148-
* run `support\build.cmd` to build libCEC and cec-client
149-
* open `project\libcec.sln` with Visual Studio 2013.
150-
* build the project.
151-
152-
To develop for libCEC or cec-client in Visual Studio:
153-
* run `support\visual-studio.cmd`
154-
155-
To build an installer on Windows:
156-
* go to `project` and execute `create-installer.bat` to create the installer.
157-
* the installer is stored as `build\libCEC-installer.exe`
36+
See [docs/README.windows.md](docs/README.windows.md).
15837

15938
# Developers
160-
161-
We provide a C, C++, Python and .NET CLR interface to the adapter.
162-
163-
## C++ developers
164-
* the API can be found in `include/cec.h`
165-
* an example implementation can be found in `src/cec-client/cec-client.cpp`
166-
167-
## C developers
168-
* the API can be found in `include/cecc.h`
169-
* an example implementation can be found in `src/cecc-client/cecc-client.cpp`
170-
171-
## .NET developers
172-
* add a reference to `LibCecSharp.dll`
173-
* an example can be found in `src\CecSharpTester\CecSharpClient.cs`
174-
175-
## Python developers
176-
* the API is exported to Python through Swig
177-
* an example can be found in `src/pyCecClient`
178-
179-
# Developers Agreement
180-
181-
If you wish to contribute to this project, you must first sign our contributors agreement.
182-
Please see [the contributors agreement] (http://www.pulse-eight.net/contributors) for more information.
39+
See [docs/README.developers.md](docs/README.developers.md).

cmake/windows/c-flag-overrides.cmake

-5
This file was deleted.

cmake/windows/cxx-flag-overrides.cmake

-5
This file was deleted.

debian/changelog.in

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
libcec (3.2.0.1~#DIST#) #DIST#; urgency=medium
2+
3+
* Slit up repositories for libCEC and .Net utilities.
4+
5+
-- Pulse-Eight Packaging <[email protected]> Wed, 19 Oct 2016 16:57:00 +0100
6+
17
libcec (3.1.0.1~#DIST#) #DIST#; urgency=medium
28

39
* changed / added:

debian/control.precise

-69
This file was deleted.

debian/rules.hardy

-11
This file was deleted.

debian/rules.precise

-11
This file was deleted.

docs/README.debian.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
### Debian
2+
Use the following commands to create a Debian package:
3+
```
4+
source /etc/lsb-release
5+
sed "s/#DIST#/${DISTRIB_CODENAME}/g" debian/changelog.in > debian/changelog
6+
dpkg-buildpackage
7+
```

docs/README.developers.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Developers
2+
3+
We provide a C, C++, Python and .NET CLR interface to the adapter.
4+
5+
## C++ developers
6+
* the API can be found in `include/cec.h`
7+
* an example implementation can be found on https://github.com/Pulse-Eight/cec-utils/blob/master/src/cec-client/cec-client.cpp
8+
9+
## C developers
10+
* the API can be found in `include/cecc.h`
11+
* an example implementation can be found on https://github.com/Pulse-Eight/cec-utils/blob/master/src/cecc-client/cecc-client.cpp
12+
13+
## .NET developers
14+
* add a reference to `LibCecSharp.dll`
15+
* add `cec.dll` to your project and enable "copy to output directory"
16+
* an example implementation can be found on https://github.com/Pulse-Eight/cec-utils/blob/master/src/CecSharpTester/CecSharpClient.cs
17+
18+
## Python developers
19+
* the API is exported to Python through Swig
20+
* an example implementation can be found on https://github.com/Pulse-Eight/cec-utils/blob/master/src/pyCecClient/pyCecClient.py
21+
22+
# Developers Agreement
23+
24+
If you wish to contribute to this project, you must first sign our contributors agreement.
25+
Please see [the contributors agreement] (http://www.pulse-eight.net/contributors) for more information.

0 commit comments

Comments
 (0)