viewtopic.php?f=15&t=6930&p=38045#p38045
and
viewtopic.php?f=15&t=6930&p=38045#p38538
$ svn checkout -r 494 http://ps3mediaserver.googlecode.com/svn/trunk/ pms494 &
$ cd ./pms494/ps3mediaserver/
$ cp ~/BDP-Sx70-v2.1.patch ./
$ patch -p0 < BDP-Sx70-v2.1.patch
$ cd ../..
~$ svn update http://ps3mediaserver.googlecode.com/svn/trunk/ pms494
Skipped 'http://ps3mediaserver.googlecode.com/svn/trunk'
U pms494/ps3mediaserver/plugins/plugins.txt
U pms494/ps3mediaserver/net/pms/network/HTMLConsole.java
U pms494/ps3mediaserver/net/pms/newgui/LinksTab.java
G pms494/ps3mediaserver/net/pms/encoders/MEncoderVideo.java
U pms494/ps3mediaserver/net/pms/encoders/Player.java
U pms494/ps3mediaserver/net/pms/encoders/TSMuxerVideo.java
U pms494/ps3mediaserver/net/pms/configuration/PmsConfiguration.java
U pms494/ps3mediaserver/net/pms/dlna/MediaInfoParser.java
G pms494/ps3mediaserver/net/pms/dlna/DLNAResource.java
U pms494/ps3mediaserver/net/pms/PMS.java
U pms494/ps3mediaserver/net/pms/external/ExternalFactory.java
U pms494/ps3mediaserver/net/pms/io/PipeIPCProcess.java
U pms494/ps3mediaserver/net/pms/util/FileUtil.java
U pms494/ps3mediaserver/net/pms/util/PMSUtil.java
U pms494/ps3mediaserver/build.xml
U pms494/ps3mediaserver/icon.ico
U pms494/ps3mediaserver/win32/ffmpeg.exe
U pms494/ps3mediaserver/win32/service/wrapper.conf
U pms494/ps3mediaserver/win32/builds.txt
U pms494/ps3mediaserver/PMS.bat
U pms494/ps3mediaserver/third-party/nsis/Contrib/Graphics/Icons/modern-install.ico
U pms494/ps3mediaserver/PMS.sh
U pms494/ps3mediaserver/osx/build.xml
U pms494/ps3mediaserver/resources/images/thumbnail-256.png
U pms494/ps3mediaserver/resources/images/icon_tree_node-16.png
A pms494/ps3mediaserver/resources/images/logo.png
U pms494/ps3mediaserver/resources/images/thumbnail-120.jpg
U pms494/ps3mediaserver/resources/images/icon_tree_node_fail-16.png
U pms494/ps3mediaserver/resources/images/icon-256.png
U pms494/ps3mediaserver/resources/images/icon-32.png
U pms494/ps3mediaserver/resources/images/icon-16.png
U pms494/ps3mediaserver/nsis/pms.nsi
Updated to revision 512.
Summary of conflicts:
Skipped paths: 1
~$ cd ./pms494/ps3mediaserver/
~/pms494/ps3mediaserver$ ant
Buildfile: build.xml
depends:
clean:
[delete] Deleting directory /home/user/pms494/ps3mediaserver/dist
[delete] Deleting: /home/user/pms494/ps3mediaserver/pms.jar
PMS:
[mkdir] Created dir: /home/user/pms494/ps3mediaserver/classes
[javac] Compiling 168 source files to /home/user/pms494/ps3mediaserver/classes
[javac] Note: /home/user/pms494/ps3mediaserver/net/pms/network/RequestHandlerV2.java uses or overrides a deprecated API.
[javac] Note: Recompile with -Xlint:deprecation for details.
[jar] Building jar: /home/user/pms494/ps3mediaserver/pms.jar
[jar] META-INF/LICENSE.txt already added, skipping
[jar] META-INF/NOTICE.txt already added, skipping
[jar] META-INF/LICENSE.txt already added, skipping
[jar] META-INF/NOTICE.txt already added, skipping
[jar] META-INF/LICENSE.txt already added, skipping
[jar] META-INF/LICENSE.txt already added, skipping
[jar] META-INF/NOTICE.txt already added, skipping
[jar] META-INF/LICENSE already added, skipping
[jar] META-INF/NOTICE already added, skipping
[mkdir] Created dir: /home/user/pms494/ps3mediaserver/dist
[tar] Building tar: /home/user/pms494/ps3mediaserver/dist/pms-generic-linux-unix-1.21.0.tgz
[delete] Deleting directory /home/user/pms494/ps3mediaserver/classes
creatensis:
BUILD SUCCESSFUL
Total time: 15 seconds
$ ps aux | grep java
user 4748 0.4 3.0 1101568 30912 pts/0 Sl 18:35 0:01 java -Xmx768M -Xss16M -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true -classpath /home/user/pms494/ps3mediaserver/update.jar:/home/user/pms494/ps3mediaserver/pms.jar net.pms.PMS
user 4832 0.0 0.0 3324 796 pts/0 S+ 18:41 0:00 grep java
user@host:~/pms494/ps3mediaserver$ java -version
java version "1.6.0_24"
Java(TM) SE Runtime Environment (build 1.6.0_24-b07)
Java HotSpot(TM) Client VM (build 19.1-b02, mixed mode, sharing)
(Stripping trailing CRs from patch.)
patching file net/pms/configuration/RendererConfiguration.java
(Stripping trailing CRs from patch.)
patching file net/pms/dlna/DLNAMediaInfo.java
(Stripping trailing CRs from patch.)
patching file net/pms/dlna/DLNAResource.java
Hunk #1 succeeded at 48 (offset 2 lines).
Hunk #2 succeeded at 895 (offset -7 lines).
Hunk #3 succeeded at 1126 (offset -7 lines).
Hunk #4 succeeded at 1149 (offset -7 lines).
(Stripping trailing CRs from patch.)
patching file net/pms/dlna/RealFile.java
(Stripping trailing CRs from patch.)
patching file net/pms/dlna/WebStream.java
(Stripping trailing CRs from patch.)
patching file net/pms/encoders/MEncoderVideo.java
Hunk #1 succeeded at 1091 with fuzz 1 (offset -53 lines).
Hunk #2 FAILED at 1162.
1 out of 2 hunks FAILED -- saving rejects to file net/pms/encoders/MEncoderVideo.java.rej
(Stripping trailing CRs from patch.)
patching file net/pms/io/SizeLimitInputStream.java
(Stripping trailing CRs from patch.)
patching file net/pms/network/RequestV2.java
(Stripping trailing CRs from patch.)
patching file PMS.conf
(Stripping trailing CRs from patch.)
patching file renderers/BDP-s370.conf
Return to Alternative Media Renderers
Users browsing this forum: No registered users and 1 guest