Apply tizen packaging 51/261651/1 accepted/tizen_6.5_unified tizen_6.5 accepted/tizen/6.5/unified/20211029.012802 accepted/tizen/unified/20210818.215302 submit/tizen/20210818.092309 submit/tizen_6.5/20211028.163401 tizen_6.5.m2_release
authorJunkyeong, Kim <jk0430.kim@samsung.com>
Thu, 22 Jul 2021 05:29:21 +0000 (14:29 +0900)
committerJunkyeong, Kim <jk0430.kim@samsung.com>
Thu, 22 Jul 2021 05:29:53 +0000 (14:29 +0900)
Change-Id: I4b91fea9ecebcc326c90545ec038b5224a590fb6
Signed-off-by: Junkyeong, Kim <jk0430.kim@samsung.com>
31 files changed:
.github/ISSUE_TEMPLATE.md [deleted file]
.github/ISSUE_TEMPLATE/bug_report.md [deleted file]
.github/ISSUE_TEMPLATE/feature_request.md [deleted file]
.github/PULL_REQUEST_TEMPLATE.md [deleted file]
.github/workflows/codeql-analysis.yml [deleted file]
CMakeLists.txt
channels/urbdrc/ChannelOptions.cmake
freerdp.pc.in [new file with mode: 0644]
libfreerdp/freerdp.pc.in
packaging/deb/freerdp-nightly/changelog [deleted file]
packaging/deb/freerdp-nightly/compat [deleted file]
packaging/deb/freerdp-nightly/control [deleted file]
packaging/deb/freerdp-nightly/copyright [deleted file]
packaging/deb/freerdp-nightly/freerdp-nightly-dbg.lintian-overrides [deleted file]
packaging/deb/freerdp-nightly/freerdp-nightly-dev.install [deleted file]
packaging/deb/freerdp-nightly/freerdp-nightly-dev.lintian-overrides [deleted file]
packaging/deb/freerdp-nightly/freerdp-nightly.install [deleted file]
packaging/deb/freerdp-nightly/freerdp-nightly.lintian-overrides [deleted file]
packaging/deb/freerdp-nightly/lintian-overrides [deleted file]
packaging/deb/freerdp-nightly/rules [deleted file]
packaging/deb/freerdp-nightly/source/format [deleted file]
packaging/flatpak/com.freerdp.FreeRDP.json [deleted file]
packaging/flatpak/freerdp.sh [deleted file]
packaging/freerdp.manifest [new file with mode: 0644]
packaging/freerdp.spec [new file with mode: 0644]
packaging/rpm/freerdp-nightly-rpmlintrc [deleted file]
packaging/rpm/freerdp-nightly.spec [deleted file]
packaging/scripts/prepare_deb_freerdp-nightly.sh [deleted file]
packaging/scripts/prepare_rpm_freerdp-nightly.sh [deleted file]
winpr/tools/winpr-tools.pc.in
winpr/winpr.pc.in

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644 (file)
index 77704ee..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-## Found a bug? - We would like to help you and smash the bug away.
-1. __Please don't "report" questions as bugs.__
-  * We are reachable via IRC _#freerdp on freenode_
-  * We are reachable via mailing list <freerdp-devel@lists.sourceforge.net>
-  * Try our mailing list for discussions/questions
-1. Before reporting a bug have a look into our issue tracker to see if the bug was already reported and you can add some additional information.
-1. If it's a __new__ bug - create a new issue.
-1. For more details see https://github.com/FreeRDP/FreeRDP/wiki/BugReporting
-
-## To save time and help us identify the issue a bug report should at least contain the following:
-  * a useful description of the bug - "It's not working" isn't good enough - you must try harder ;)
-  * the steps to reproduce the bug
-  * command line you have used
-  * to what system did you connect to? (win8, 2008, ..)
-  * what did you expect to happen?
-  * what actually happened?
-  * freerdp version (e.g. xfreerdp --version) or package version or git commit
-  * freerdp configuration (e.g. xfreerdp --buildconfig)
-  * operating System, architecture, distribution e.g. linux, amd64, debian
-  * if you built it yourself add some notes which branch you have used, also your cmake parameters can help
-  * extra information helping us to find the bug
-
-## Please remove this text before submitting your issue!
-
-_Thank you for reporting a bug!_
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644 (file)
index 8ee9f39..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Found a bug? - We would like to help you and smash the bug away.**
-1. __Please don't "report" questions as bugs. For these (questions/build instructions/...) please use one of the following means of contact:__
-   * We are reachable via IRC _#freerdp on freenode_
-   * We are reachable via mailing list <freerdp-devel@lists.sourceforge.net>
-   * Try our mailing list for discussions/questions
-1. Before reporting a bug have a look into our issue tracker to see if the bug was already reported and you can add some additional information.
-1. If it's a __new__ bug - create a new issue.
-1. For more details see https://github.com/FreeRDP/FreeRDP/wiki/BugReporting
-
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Application details**
-* Version of FreeRDP
-* Command line used
-* output of `/buildconfig`
-* OS version connecting to
-* If available the log output from a run with `/log-level:trace` 
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
-
-** Please remove this text before submitting your issue!
-
-_Thank you for reporting a bug!_
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644 (file)
index 066b2d9..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644 (file)
index 91a1cef..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-## This is how are pull requests handled by FreeRDP
-1. Every new pull request needs to build and pass the unit tests at https://ci.freerdp.com
-1. At least 1 (better two) people need to review and test a pull request and agree to accept
-
-## Preparations before creating a pull
-* Rebase your branch to current master, no merges allowed!
-* Try to clean up your commit history, group changes to commits
-* Check your formatting! A _clang-format_ script can be found at ```.clang-format```
-  * The cmake target ```clangformat``` reformats the whole codebase
-* Optional (but higly recommended)
-  * Run a clang scanbuild before and after your changes to avoid introducing new bugs
-  * Run your compiler at pedantic level to check for new warnings
-
-## To ease accepting your contribution
-* Give the pull request a proper name so people looking at it have an basic idea what it is for
-* Add at least a brief description what it does (or should do :) and what it's good for
-* Give instructions on how to test your changes
-* Ideally add unit tests if adding new features
-
-## What you should be prepared for
-* fix issues found during the review phase
-* Joining IRC _#freerdp_ to talk to other developers or help them test your pull might accelerate acceptance
-* Joining our mailing list <freerdp-devel@lists.sourceforge.net> may be helpful too.
-
-## Please remove this text before submitting your pull!
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644 (file)
index aa6df82..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master, stable* ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master, stable* ]
-  schedule:
-    - cron: '30 8 * * 6'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    # - name: Autobuild
-    #   uses: github/codeql-action/autobuild@v1
-
-    # â„šī¸ Command-line programs to run using the OS shell.
-    # đŸ“š https://git.io/JvXDl
-
-    # âœī¸ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    - run: |
-       sudo apt update
-       sudo apt install libxrandr-dev libxinerama-dev libusb-1.0-0-dev xserver-xorg-dev libswscale-dev libswresample-dev libavutil-dev libavcodec-dev libcups2-dev libpulse-dev libasound2-dev libpcsclite-dev xsltproc libxcb-cursor-dev libxcursor-dev libcairo2-dev libfaac-dev libfaad-dev libjpeg-dev libgsm1-dev ninja-build libxfixes-dev libxkbcommon-dev libwayland-dev libpam0g-dev libxdamage-dev libxcb-damage0-dev ccache libxtst-dev libfuse-dev libsystemd-dev libcairo2-dev libsoxr-dev
-       mkdir ci-build
-       cd ci-build
-       cmake -GNinja ../ci/cmake-preloads/config-linux-all.txt ..
-       cmake --build .
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
index 062a93f..2c82613 100644 (file)
@@ -962,16 +962,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 # RPATH configuration
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+#set(CMAKE_SKIP_BUILD_RPATH FALSE)
+#set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 if (APPLE)
        set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
        set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
 else (APPLE)
-       set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-       if (NOT FREEBSD)
-               set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
-       endif()
+#      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+#      if (NOT FREEBSD)
+#              set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
+#      endif()
 endif(APPLE)
 
 if (BUILD_SHARED_LIBS)
index 770ba5e..e817ca5 100644 (file)
@@ -4,8 +4,8 @@ if (IOS OR ANDROID)
        set(OPTION_CLIENT_DEFAULT OFF)
        set(OPTION_SERVER_DEFAULT OFF)
 else()
-       set(OPTION_DEFAULT ON)
-       set(OPTION_CLIENT_DEFAULT ON)
+       set(OPTION_DEFAULT OFF)
+       set(OPTION_CLIENT_DEFAULT OFF)
        set(OPTION_SERVER_DEFAULT OFF)
 endif()
 
diff --git a/freerdp.pc.in b/freerdp.pc.in
new file mode 100644 (file)
index 0000000..59e2b44
--- /dev/null
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_PREFIX@/include
+
+Name: FreeRDP
+Description: A free remote desktop protocol client
+URL: http://www.freerdp.com/
+Version: @FREERDP_VERSION_FULL@
+Requires: 
+Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc -lwinpr-utils
+Cflags: -I${includedir}
+
index a5d5c8b..3542f7f 100644 (file)
@@ -9,7 +9,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation
 URL: http://www.freerdp.com/
 Version: @FREERDP_VERSION@
 Requires: 
-Requires.private: @WINPR_PKG_CONFIG_FILENAME@ libssl
+Requires.private: @WINPR_PKG_CONFIG_FILENAME@
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lpthread
 Cflags: -I${includedir}
diff --git a/packaging/deb/freerdp-nightly/changelog b/packaging/deb/freerdp-nightly/changelog
deleted file mode 100644 (file)
index 4248a0f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-freerdp-nightly (2.0.0) unstable; urgency=low
-
-  * Update version to 2.0.0
-
- -- FreeRDP <team@freerdp.com>  Tue, 17 Nov 2015 23:26:12 +0100
-
-freerdp-nightly (1.2.1) unstable; urgency=low
-
-  * Update version to 1.2.1
-
- -- FreeRDP <team@freerdp.com>  Tue, 03 Feb 2015 13:44:33 +0100
-
-freerdp-nightly (1.2.0) unstable; urgency=medium
-
-  * Initial version of freerdp-nightly
-
- -- FreeRDP <team@freerdp.com>  Wed, 07 Jan 2015 10:09:32 +0100
diff --git a/packaging/deb/freerdp-nightly/compat b/packaging/deb/freerdp-nightly/compat
deleted file mode 100644 (file)
index f599e28..0000000
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control
deleted file mode 100644 (file)
index b6d9e77..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-Source: freerdp-nightly
-Section: x11
-Priority: optional
-Maintainer: FreeRDP <team@freerdp.com>
-Build-Depends:
- debhelper (>= 9),
- cdbs,
- dpkg-dev,
- autotools-dev,
- cmake,
- pkg-config,
- xmlto,
- libssl-dev,
- docbook-xsl,
- xsltproc,
- libxkbfile-dev,
- libx11-dev,
- libwayland-dev,
- libxrandr-dev,
- libxi-dev,
- libxrender-dev,
- libxext-dev,
- libxinerama-dev,
- libxfixes-dev,
- libxcursor-dev,
- libxv-dev,
- libxdamage-dev,
- libxtst-dev,
- libcups2-dev,
- libcairo2-dev,
- libpcsclite-dev,
- libasound2-dev,
- libpulse-dev, 
- libavcodec-dev,
- libavutil-dev,
- libswresample-dev | libavresample-dev,
- libusb-1.0-0-dev,
- libudev-dev,
- libdbus-glib-1-dev,
- uuid-dev, 
- libxml2-dev,
- libgstreamer1.0-dev | libgstreamer0.10-dev,
- libgstreamer-plugins-base1.0-dev | libgstreamer-plugins-base0.10-dev
-Standards-Version: 3.9.5
-Homepage: http://www.freerdp.com/
-Vcs-Browser: http://github.com/FreeRDP/FreeRDP.git
-Vcs-Git: git://github.com/FreeRDP/FreeRDP.git
-
-Package: freerdp-nightly
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: freerdp
-Description: RDP client for Windows Terminal Services (X11 client)
- FreeRDP is a libre client/server implementation of the Remote
- Desktop Protocol (RDP).
- .
- Currently, the FreeRDP client supports the following Windows Versions:
- .
-  * Windows NT Server
-  * Windows 2000 Terminal Server
-  * Windows XP
-  * Windows 2003 Server
-  * Windows Vista
-  * Windows 2008/2008r2/2011SBS Server
-  * Windows 7
-  * Windows 2012 Server
-  * Windows 8
- .
- This package contains the X11 based client.
-
-Package: freerdp-nightly-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: freerdp-nightly (= ${binary:Version}), ${misc:Depends}
-Description: Free Remote Desktop Protocol library (development files)
- FreeRDP is a libre client/server implementation of the Remote
- Desktop Protocol (RDP).
- .
- This package contains the FreeRDP development files.
-
-Package: freerdp-nightly-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- freerdp-nightly (= ${binary:Version}), ${misc:Depends},
-Description: RDP client for Windows Terminal Services (X11 client, debug symbols)
- FreeRDP is a libre client/server implementation of the Remote
- Desktop Protocol (RDP).
- .
- This package contains the debug symbols of the xfreerdp executable.
diff --git a/packaging/deb/freerdp-nightly/copyright b/packaging/deb/freerdp-nightly/copyright
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dbg.lintian-overrides b/packaging/deb/freerdp-nightly/freerdp-nightly-dbg.lintian-overrides
deleted file mode 100644 (file)
index 8108c1e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-freerdp-nightly-dbg: no-copyright-file new-package-should-close-itp-bug dir-or-file-in-opt package-name-doesnt-match-sonames
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.install
deleted file mode 100644 (file)
index 11d3295..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-opt/freerdp-nightly/lib/*.so
-opt/freerdp-nightly/lib/pkgconfig
-opt/freerdp-nightly/lib/cmake
-opt/freerdp-nightly/include
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly-dev.lintian-overrides b/packaging/deb/freerdp-nightly/freerdp-nightly-dev.lintian-overrides
deleted file mode 100644 (file)
index 0f6ac7a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-freerdp-nightly-dev: no-copyright-file dir-or-file-in-opt
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly.install b/packaging/deb/freerdp-nightly/freerdp-nightly.install
deleted file mode 100644 (file)
index 1b576fe..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-opt/freerdp-nightly/lib/*.so.*
-opt/freerdp-nightly/bin
-opt/freerdp-nightly/share/man/man1/*.1*
-opt/freerdp-nightly/share/man/man7/wlog.7*
diff --git a/packaging/deb/freerdp-nightly/freerdp-nightly.lintian-overrides b/packaging/deb/freerdp-nightly/freerdp-nightly.lintian-overrides
deleted file mode 100644 (file)
index 62263e0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-freerdp-nightly: no-copyright-file new-package-should-close-itp-bug dir-or-file-in-opt package-name-doesnt-match-sonames
diff --git a/packaging/deb/freerdp-nightly/lintian-overrides b/packaging/deb/freerdp-nightly/lintian-overrides
deleted file mode 100644 (file)
index d583c69..0000000
+++ /dev/null
@@ -1 +0,0 @@
-freerdp-nightly source: no-debian-copyright
diff --git a/packaging/deb/freerdp-nightly/rules b/packaging/deb/freerdp-nightly/rules
deleted file mode 100755 (executable)
index cf50c7e..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/make -f
-
-NULL =
-
-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-SANATIZE_ADDRESS = -DWITH_SANITIZE_ADDRESS=ON
-
-DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_SKIP_RPATH=FALSE \
-                          -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
-                          -DWITH_PULSE=ON \
-                          -DWITH_CHANNELS=ON \
-                          -DBUILTIN_CHANNELS=ON \
-                          -DWITH_CUPS=ON \
-                          -DWITH_PCSC=ON \
-                          -DWITH_GSTREAMER_0_10=ON \
-                          -DWITH_FFMPEG=ON \
-                          -DWITH_DSP_FFMPEG=ON \
-                          -DCHANNEL_URBDRC=ON \
-                          -DCHANNEL_URBDRC_CLIENT=ON \
-                          -DWITH_SERVER=ON \
-                          -DWITH_WAYLAND=ON \
-                          -DWITH_CAIRO=ON \
-                          -DBUILD_TESTING=OFF \
-                          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                          -DCMAKE_INSTALL_PREFIX=/opt/freerdp-nightly/ \
-                          -DCMAKE_INSTALL_INCLUDEDIR=include \
-                          -DCMAKE_INSTALL_LIBDIR=lib \
-                          $(SANATIZE_ADDRESS) \
-                          $(NULL)
-
-%:
-       dh $@ --parallel
-
-override_dh_auto_configure:
-       dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
-
-override_dh_shlibdeps:
-       dh_shlibdeps -l /opt/freerdp-nightly/lib/
-
-override_dh_strip:
-       dh_strip --dbg-package=freerdp-nightly-dbg
-
-override_dh_install:
-       mkdir -p debian/tmp/opt/freerdp-nightly/lib/cmake/
-       rm -rf debian/tmp/opt/freerdp-nightly/lib/freerdp2/*.a
-
-       dh_install --fail-missing
-
-override_dh_clean:
-       rm -f config.h
-       dh_clean
diff --git a/packaging/deb/freerdp-nightly/source/format b/packaging/deb/freerdp-nightly/source/format
deleted file mode 100644 (file)
index 89ae9db..0000000
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json
deleted file mode 100644 (file)
index 815b914..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "app-id": "com.freerdp.FreeRDP",
-    "runtime": "org.freedesktop.Platform",
-    "runtime-version": "19.08",
-    "sdk": "org.freedesktop.Sdk",
-    "build-options" : {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g"
-    },
-    "command": "freerdp.sh",
-    "cleanup": [
-    ],
-    "finish-args": [
-        /* X11 + XShm access */
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=fallback-x11",
-        /* Needs to talk to the network */
-        "--share=network",
-        /* Play sounds redirected from guests */
-        "--socket=pulseaudio",
-        /* Wayland access */
-        "--socket=wayland",
-        /* Allow rw access to download folder */
-        "--filesystem=xdg-download"
-    ],
-    "modules": [
-    {
-        /**
-         * libfreerdp use xprop to try to detect keyboard layout
-         */
-        "name": "xprop",
-        "sources": [
-        {
-            "type": "archive",
-            "url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.3.tar.bz2",
-            "sha256": "d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b"
-        }
-        ]
-    },
-    {
-        "name": "libusb",
-        "config-opts": ["--disable-static"],
-        "sources": [
-            {
-                "type": "git",
-                "url": "https://github.com/libusb/libusb.git",
-                "tag": "v1.0.22",
-                "commit": "0034b2afdcdb1614e78edaa2a9e22d5936aeae5d"
-            }
-        ]
-    },
-    {
-        "name": "pcsc",
-        "config-opts": [
-            "--disable-libsystemd",
-            "--enable-pic",
-            "--disable-libusb",
-            "--enable-shared",
-            "--with-systemdsystemunitdir=/app/lib/systemd/"
-        ],
-        "sources": [
-            {
-                "type": "git",
-                "url": "https://github.com/LudovicRousseau/PCSC.git",
-                "tag": "pcsc-1.8.24",
-                "commit": "73d95ada3221c060cbd7b6aa2375453f9d0e359b"
-            }
-        ]
-    },
-    {
-        "name": "wrapper",
-        "buildsystem": "simple",
-        "build-commands": [
-                "install -D freerdp.sh /app/bin/freerdp.sh"
-            ],
-        "sources": [
-                {
-                     "type": "file",
-                     "path": "freerdp.sh"
-                }
-            ]
-    },
-    {
-        "name": "freerdp",
-        "buildsystem": "cmake-ninja",
-        "cleanup": [
-        ],
-        "config-opts": [
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_INSTALL_LIBDIR:PATH=lib",
-        "-DCHANNEL_TSMF:BOOL=ON",
-        "-DCHANNEL_URBDRC:BOOL=ON",
-        "-DBUILD_TESTING:BOOL=OFF",
-        "-DWITH_MANPAGES:BOOL=OFF",
-        "-DWITH_GSSAPI:BOOL=OFF",
-        "-DWITH_PCSC:BOOL=ON",
-        "-DWITH_SERVER:BOOL=ON",
-        "-DWITH_SAMPLE:BOOL=ON",
-        "-DWITH_CUPS:BOOL=ON",
-        "-DWITH_FFMPEG:BOOL=ON",
-        "-DWITH_DSP_FFMPEG:BOOL=ON",
-        "-DWITH_OSS:BOOL=OFF",
-        "-DWITH_PULSE:BOOL=ON"
-        ],
-        "sources": [
-        {
-            "type": "git",
-            "url": "https://github.com/FreeRDP/FreeRDP.git",
-            "branch": "master"
-        }
-        ]
-    }
-    ]
-}
diff --git a/packaging/flatpak/freerdp.sh b/packaging/flatpak/freerdp.sh
deleted file mode 100755 (executable)
index 1f62b8b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-if [ -z $XDG_SESSION_TYPE ];
-then
-       echo "XDG_SESSION_TYPE undefined"
-       exit -1
-elif [ "$XDG_SESSION_TYPE" = "wayland" ];
-then
-       echo "wayland $(which wlfreerdp)"
-       wlfreerdp $@
-elif [ "$XDG_SESSION_TYPE" = "x11" ];
-then
-       echo "X11 $(which xfreerdp)"
-       xfreerdp $@
-       exit $rc
-else
-       echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled"
-       exit -1
-fi
diff --git a/packaging/freerdp.manifest b/packaging/freerdp.manifest
new file mode 100644 (file)
index 0000000..84e129a
--- /dev/null
@@ -0,0 +1,8 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+ <assign>
+    <filesystem path="/usr/bin/winpr-makecert" exec_label="User" />
+ </assign>
+</manifest>
diff --git a/packaging/freerdp.spec b/packaging/freerdp.spec
new file mode 100644 (file)
index 0000000..dcbfdcf
--- /dev/null
@@ -0,0 +1,135 @@
+%bcond_with x
+%bcond_with wayland
+
+Name:           freerdp
+Version:        2.3.2
+Release:        0
+Summary:        Remote Desktop Protocol functionality
+License:        Apache-2.0
+Group:          Graphics & UI Framework/Development
+Url:            http://www.freerdp.com/
+
+Source0:         %name-%version.tar.xz
+Source1:       freerdp.manifest
+BuildRequires: cmake
+BuildRequires:  libtool >= 2.2
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(openssl1.1)
+BuildRequires:  libopenssl1.1-devel
+%if %{with wayland}
+BuildRequires:  pkgconfig(wayland-client)
+%endif
+%if %{with x}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xkbfile)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xtst)
+BuildRequires:  pkgconfig(xv)
+%endif
+
+%description
+FreeRDP is a free implementation of the Remote Desktop Protocol (RDP)
+according to the Microsoft Open Specifications.
+
+%package devel
+Summary: Development files for package %{name}
+Group:   Graphics & UI Framework/Development
+Requires: freerdp = %{version}-%{release}
+%description devel
+This package provides header files and other developer related files
+for package %{name}.
+
+%prep
+%setup -q
+cp %{SOURCE1} .
+
+%build
+cmake \
+        -DWITH_CLIENT:BOOL=ON \
+%if %{with wayland}
+        -DWITH_WAYLAND:BOOL=ON \
+%else
+        -DWITH_WAYLAND:BOOL=OFF \
+%endif
+%if %{with x}
+        -DWITH_X11:BOOL=ON \
+%else
+        -DWITH_X11:BOOL=OFF \
+%endif
+%ifarch aarch64
+        -DWITH_NEON:BOOL=OFF \
+%endif
+        -DWITH_SERVER:BOOL=ON \
+        -DWITH_ALSA:BOOL=ON \
+        -DWITH_SSE2:BOOL=OFF \
+        -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
+       -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+       -DCMAKE_INSTALL_LIBDIR=%{_libdir}
+
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp
+cp include/freerdp/*.h $RPM_BUILD_ROOT/usr/include/freerdp
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/cache
+cp include/freerdp/cache/*.h $RPM_BUILD_ROOT/usr/include/freerdp/cache
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/channels
+cp include/freerdp/channels/*.h $RPM_BUILD_ROOT/usr/include/freerdp/channels
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/client
+cp include/freerdp/client/*.h $RPM_BUILD_ROOT/usr/include/freerdp/client
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/codec
+cp include/freerdp/codec/*.h $RPM_BUILD_ROOT/usr/include/freerdp/codec
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/crypto
+cp include/freerdp/crypto/*.h $RPM_BUILD_ROOT/usr/include/freerdp/crypto
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/gdi
+cp include/freerdp/gdi/*.h $RPM_BUILD_ROOT/usr/include/freerdp/gdi
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/locale
+cp include/freerdp/locale/*.h $RPM_BUILD_ROOT/usr/include/freerdp/locale
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/server
+cp include/freerdp/server/*.h $RPM_BUILD_ROOT/usr/include/freerdp/server
+mkdir -p $RPM_BUILD_ROOT/usr/include/freerdp/utils
+cp include/freerdp/utils/*.h $RPM_BUILD_ROOT/usr/include/freerdp/utils
+
+mkdir -p $RPM_BUILD_ROOT/usr/include/winpr
+cp winpr/include/winpr/*.h $RPM_BUILD_ROOT/usr/include/winpr
+mkdir -p $RPM_BUILD_ROOT/usr/include/winpr/tools
+cp winpr/include/winpr/tools/makecert.h $RPM_BUILD_ROOT/usr/include/winpr/tools
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%license LICENSE
+%{_libdir}/lib*.so.*
+%{_bindir}/freerdp-proxy*
+%{_bindir}/freerdp-shadow-cli*
+%{_bindir}/winpr-hash*
+%{_bindir}/winpr-makecert*
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/freerdp*.pc
+%{_libdir}/pkgconfig/winpr*.pc
+%{_includedir}/freerdp
+%{_includedir}/winpr
+
+%changelog
+%define _unpackaged_files_terminate_build 0
+%define _missing_doc_files_terminate_build 0
diff --git a/packaging/rpm/freerdp-nightly-rpmlintrc b/packaging/rpm/freerdp-nightly-rpmlintrc
deleted file mode 100644 (file)
index d747a31..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# files are on purpose in /opt - vendor package
-addFilter("dir-or-file-in-opt")
-# required in this case that the binaries work
-addFilter("binary-or-shlib-defines-rpath")
-# ldconfig run not required
-addFilter("library-without-ldconfig-postin")
-addFilter("library-without-ldconfig-postun")
-# keep debug symbols and so directly in the package
-addFilter("unstripped-binary-or-object /opt/freerdp-nightly/lib64/*")
-addFilter("unstripped-binary-or-object /opt/freerdp-nightly/bin/*")
-addFilter("no-documentation")
-addFilter("manpage-not-compressed")
-addFilter("suse-filelist-forbidden-opt")
diff --git a/packaging/rpm/freerdp-nightly.spec b/packaging/rpm/freerdp-nightly.spec
deleted file mode 100644 (file)
index f17bfac..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# spec file for package freerdp-nightly
-#
-# Copyright (c) 2015 Bernhard Miklautz <bernhard.miklautz@shacknet.at>
-#
-# Bugs and comments https://github.com/FreeRDP/FreeRDP/issues
-
-
-%define   INSTALL_PREFIX /opt/freerdp-nightly/
-
-# do not add provides for libs provided by this package
-# or it could possibly mess with system provided packages
-# which depend on freerdp libs
-%global __provides_exclude_from ^%{INSTALL_PREFIX}.*$
-
-# do not require our own libs
-%global __requires_exclude ^(libfreerdp.*|libwinpr).*$
-
-Name:           freerdp-nightly
-Version:        2.0
-Release:        0
-License:        ASL 2.0
-Summary:        Free implementation of the Remote Desktop Protocol (RDP)
-Url:            http://www.freerdp.com
-Group:          Productivity/Networking/Other
-Source0:        %{name}-%{version}.tar.bz2
-Source1:        source_version
-BuildRequires:   gcc-c++
-BuildRequires:  cmake >= 2.8.12
-BuildRequires: libxkbfile-devel
-BuildRequires: libX11-devel
-BuildRequires: libXrandr-devel
-BuildRequires: libXi-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXext-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXfixes-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXv-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libXtst-devel
-BuildRequires: cups-devel
-BuildRequires: cairo-devel
-BuildRequires: pcsc-lite-devel
-BuildRequires: uuid-devel
-BuildRequires: libxml2-devel
-BuildRequires: zlib-devel
-BuildRequires: krb5-devel
-
-# (Open)Suse
-%if %{defined suse_version}
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: libxslt-tools
-BuildRequires: pkg-config
-BuildRequires: libopenssl-devel
-BuildRequires: alsa-devel
-BuildRequires: libpulse-devel
-BuildRequires: libusb-1_0-devel
-BuildRequires: libudev-devel
-BuildRequires: dbus-1-glib-devel
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: wayland-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libavutil-devel
-BuildRequires: libavcodec-devel
-BuildRequires: libswresample-devel
-%endif
-# fedora 21+
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
-BuildRequires: docbook-style-xsl
-BuildRequires: libxslt
-BuildRequires: pkgconfig
-BuildRequires: openssl-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: libusbx-devel
-BuildRequires: systemd-devel
-BuildRequires: dbus-glib-devel
-BuildRequires: gstreamer1-devel
-BuildRequires: gstreamer1-plugins-base-devel
-BuildRequires: libjpeg-turbo-devel
-%endif 
-
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
-BuildRequires: libwayland-client-devel
-%endif
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-FreeRDP is a open and free implementation of the Remote Desktop Protocol (RDP).
-This package provides nightly master builds of all components.
-
-%package devel
-Summary:        Development Files for %{name}
-Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
-
-%description devel
-This package contains development files necessary for developing applications
-based on freerdp and winpr.
-
-%prep
-%setup -q
-cd %{_topdir}/BUILD
-cp %{_topdir}/SOURCES/source_version freerdp-nightly-%{version}/.source_version
-
-%build
-
-%cmake  -DCMAKE_SKIP_RPATH=FALSE \
-        -DCMAKE_SKIP_INSTALL_RPATH=FALSE \
-        -DWITH_PULSE=ON \
-        -DWITH_CHANNELS=ON \
-        -DBUILTIN_CHANNELS=ON \
-        -DWITH_CUPS=ON \
-        -DWITH_PCSC=ON \
-        -DWITH_JPEG=ON \
-%if %{defined suse_version}
-        -DWITH_FFMPEG=ON \
-        -DWITH_DSP_FFMPEG=ON \
-%endif
-%if 0%{?fedora} < 21 || 0%{?rhel} < 8
-        -DWITH_WAYLAND=OFF \
-%endif
-        -DWITH_GSSAPI=OFF \
-        -DCHANNEL_URBDRC=ON \
-        -DCHANNEL_URBDRC_CLIENT=ON \
-        -DWITH_SERVER=ON \
-        -DWITH_CAIRO=ON \
-        -DBUILD_TESTING=OFF \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DCMAKE_INSTALL_PREFIX=%{INSTALL_PREFIX} \
-%if %{defined suse_version}
-        -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-%else
-        -DWITH_SANITIZE_ADDRESS=ON \
-%endif
-        -DCMAKE_INSTALL_LIBDIR=%{_lib}
-
-make %{?_smp_mflags}
-
-%install
-%if %{defined suse_version}
-%cmake_install
-%endif
-
-%if %{defined fedora} || %{defined rhel}
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-%endif 
-
-find %{buildroot} -name "*.a" -delete
-export NO_BRP_CHECK_RPATH true
-
-%files
-%defattr(-,root,root)
-%dir %{INSTALL_PREFIX}
-%dir %{INSTALL_PREFIX}/%{_lib}
-%dir %{INSTALL_PREFIX}/bin
-%dir %{INSTALL_PREFIX}/share/
-%dir %{INSTALL_PREFIX}/share/man/
-%dir %{INSTALL_PREFIX}/share/man/man1
-%dir %{INSTALL_PREFIX}/share/man/man7
-%{INSTALL_PREFIX}/%{_lib}/*.so.*
-%{INSTALL_PREFIX}/bin/
-%{INSTALL_PREFIX}/share/man/man1/xfreerdp.1*
-%{INSTALL_PREFIX}/share/man/man1/freerdp-shadow-cli.1*
-%{INSTALL_PREFIX}/share/man/man1/winpr-makecert.1*
-%{INSTALL_PREFIX}/share/man/man1/winpr-hash.1*
-%{INSTALL_PREFIX}/share/man/man7/wlog.7*
-
-%files devel
-%defattr(-,root,root)
-%{INSTALL_PREFIX}/%{_lib}/*.so
-%{INSTALL_PREFIX}/include/
-%{INSTALL_PREFIX}/%{_lib}/pkgconfig/
-%{INSTALL_PREFIX}/%{_lib}/cmake/
-
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
-
-
-%changelog
-* Wed Feb 7 2018 FreeRDP Team <team@freerdp.com> - 2.0.0-0
-- Update version information and support for OpenSuse 42.1
-* Tue Feb 03 2015 FreeRDP Team <team@freerdp.com> - 1.2.1-0
-- Update version information
-* Fri Jan 23 2015 Bernhard Miklautz <bmiklautz+freerdp@shacknet.at> - 1.2.0-0
-- Initial version
diff --git a/packaging/scripts/prepare_deb_freerdp-nightly.sh b/packaging/scripts/prepare_deb_freerdp-nightly.sh
deleted file mode 100755 (executable)
index a465491..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ln -s packaging/deb/freerdp-nightly  debian
-git rev-parse --short HEAD > .source_version
diff --git a/packaging/scripts/prepare_rpm_freerdp-nightly.sh b/packaging/scripts/prepare_rpm_freerdp-nightly.sh
deleted file mode 100755 (executable)
index 5401a81..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-git rev-parse --short HEAD > source_version
index f406e98..332ef52 100644 (file)
@@ -9,7 +9,7 @@ Description: WinPR: Windows Portable Runtime
 URL: http://www.freerdp.com/
 Version: @WINPR_TOOLS_VERSION@
 Requires:
-Requires.private: winpr@WINPR_VERSION_MAJOR@ libssl
+Requires.private: winpr@WINPR_VERSION_MAJOR@
 Libs: -L${libdir} ${libs}
 Libs.private: -lcrypto
 Cflags: -I${includedir}
index 6b0c950..d7c905f 100644 (file)
@@ -9,7 +9,6 @@ Description: WinPR: Windows Portable Runtime
 URL: http://www.freerdp.com/
 Version: @WINPR_VERSION@
 Requires:
-Requires.private: libssl
 Libs: -L${libdir} ${libs}
 Libs.private: -ldl -lrt -lm -lpthread
 Cflags: -I${includedir}