Commit Graph

364 Commits

Author SHA1 Message Date
Daniel Schregenberger 3dac7ce3dc
Merge pull request #12 from notandy/master
Merge recent commits to notandy/ympd master
2018-01-26 13:23:23 +01:00
Andrew Karpow 8c1115dc63 Merge branch 'master' of github.com:notandy/ympd 2018-01-22 05:02:09 +01:00
Andrew Karpow d314ac08df Merge branch 'lesderid-master' 2018-01-22 05:01:40 +01:00
Andrew Karpow ceee8bd90a Merge branch 'master' of https://github.com/lesderid/ympd into lesderid-master 2018-01-22 04:58:17 +01:00
Andy 68429e39d5
Merge pull request #157 from florianheinemann/patch-1
Update README.md to highlight OpenSSL dependency
2018-01-22 04:55:07 +01:00
Andrew Karpow b0253a01ab Merge branch 'SuperBFG7-send-message' 2018-01-22 04:50:43 +01:00
Andrew Karpow ba4322c684 Merge branch 'send-message' of https://github.com/SuperBFG7/ympd into SuperBFG7-send-message 2018-01-22 04:50:22 +01:00
Andrew Karpow 95f8ccd7a4 update travis image 2018-01-22 04:45:59 +01:00
Andrew Karpow 265577c5ab Merge branch 'BenjaminHae-sortable' 2018-01-22 04:40:52 +01:00
Andy 91e3535891
Merge pull request #156 from znetstar/master
Adds a Dockerfile
2018-01-22 04:35:21 +01:00
Andy 393d6063da
Merge pull request #149 from SuperBFG7/delete
add ability to delete ranges of the playlist
2018-01-22 04:34:54 +01:00
Andy a99b0a5ddc
Merge pull request #134 from Kernald/fix-double-slashes
Fix double slashes in websocket URL
2018-01-22 04:33:54 +01:00
Andy e436fc93b5
Merge pull request #130 from govertbuijs/master
Added crude filtering for browsing db
2018-01-22 04:32:57 +01:00
Andy b21fccc240
Merge pull request #150 from azrdev/no-overwrite-cflags
Don't overwrite CFLAGS
2018-01-22 04:26:09 +01:00
Andy f7aade410d
Merge pull request #148 from unknownloner/master
Allow MPD Password to be configured in command line options
2018-01-22 04:23:51 +01:00
Andy e0050641df
Merge pull request #145 from felixjogris/master
added FreeBSD RC script
2018-01-22 04:22:36 +01:00
Florian Heinemann bba35bf682
Update README.md to highlight OpenSSL dependency 2018-01-21 22:06:40 +01:00
Zachary Boyd 02ab7df3c6 Adds a Dockerfile for building a lightweight Docker container based on alpine 2017-12-23 12:11:47 -08:00
SuperBFG7 5589013a95 shorter browse item in menu 2017-12-18 15:16:37 +01:00
SuperBFG7 06ded692a5 Revert "Merge branch 'lmanul-master'"
This reverts commit f118c53ecb, reversing
changes made to 604d54a0bb.
2017-12-18 15:10:21 +01:00
SuperBFG7 f118c53ecb Merge branch 'lmanul-master' 2017-12-18 15:00:56 +01:00
SuperBFG7 d9182dd2f4 merge branch lmanul-master 2017-12-18 15:00:28 +01:00
SuperBFG7 604d54a0bb fix player 2017-07-31 11:56:02 +02:00
azrdev c1f1adbc28 Don't overwrite CFLAGS
Preserve user/system-configured C_FLAGS.

This broke the rpm package build on fedora: They enable a hardened config (i.e. ASLR) by default, which adds -pie and -fPIC to linker and compiler flags. Overwriting C_FLAGS removed the compiler spec, but not the linker one, leading to an error like:

/bin/cc  -std=gnu99 -Wall -ggdb -pedantic  -specs=/usr/lib/rpm/redhat/redhat-hardened-ld CMakeFiles/mkdata.dir/tools/mkdata.c.o  -o mkdata -rdynamic 
bin/ld: CMakeFiles/mkdata.dir/tools/mkdata.c.o: relocation R_X86_64_32 against `.rodata' can not be used when making a shared object; recompile with -fPIC
CMakeFiles/mkdata.dir/tools/mkdata.c.o: error adding symbols: Bad value

With this fix, the error is gone:

/bin/cc  -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -std=gnu99 -Wall -g -ggdb -pedantic  -specs=/usr/lib/rpm/redhat/redhat-hardened-ld CMakeFiles/mkdata.dir/tools/mkdata.c.o  -o mkdata -rdynamic
2017-05-14 07:37:46 +02:00
SuperBFG7 fac60b18a1 Merge branch 'delete' 2017-04-08 11:31:41 +02:00
SuperBFG7 eb803d1da5 add ability to delete ranges of the playlist 2017-04-08 11:25:40 +02:00
Galen Alderson fa4cb48830 Fix segfault when using short password option (-m) 2017-03-29 12:17:01 -04:00
SuperBFG7 269c55b9c8 Merge remote-tracking branch 'origin/send-message' 2017-03-24 11:02:25 +01:00
SuperBFG7 dfb9adb78c added missing include 2017-03-24 11:01:24 +01:00
SuperBFG7 6727b8b0ad uncommented love button 2017-03-18 13:44:04 +01:00
SuperBFG7 4f64061286 Merge remote-tracking branch 'origin/send-message' 2017-03-18 13:41:32 +01:00
SuperBFG7 152defeaaa add a button to love tracks on last.fm using mpdas 2017-03-18 13:32:17 +01:00
SuperBFG7 07c6df23bc added API command to send messages to MPD channels 2017-03-18 13:31:26 +01:00
SuperBFG7 afab4e5653 Merge branch 'fix-double-slashes' 2017-03-18 10:39:25 +01:00
SuperBFG7 66ff05e8b5 Merge branch 'fix-double-slashes' of git://github.com/Kernald/ympd into fix-double-slashes 2017-03-18 10:38:46 +01:00
SuperBFG7 6c75d5bc6c Merge branch 'eolianoe-patch-1' 2017-03-18 10:35:24 +01:00
SuperBFG7 40c335cfca Merge branch 'patch-1' of git://github.com/eolianoe/ympd into eolianoe-patch-1 2017-03-18 10:34:57 +01:00
SuperBFG7 8abcee0049 fix README 2017-03-18 10:27:52 +01:00
unknownln e5a88b1ffe quote password 2017-02-18 12:05:24 -05:00
unknownln ec74ef463b config for system services 2017-02-18 12:00:28 -05:00
unknownln a6ba0d640c Update documentation for new option 2017-02-18 11:51:03 -05:00
unknownln f79dea44a2 Add option to set MPD password 2017-02-18 11:42:20 -05:00
Felix J. Ogris 40906e2bee added FreeBSD RC script 2017-02-06 20:19:09 +01:00
Les De Ridder d9ec70a9da
Make the Dirble API token configurable and use HTTPS
Fixes #140
2016-09-11 18:23:42 +02:00
Marc Plano-Lesay 15edcc645c Fix double slashes in websocket URL 2016-07-07 15:22:15 +02:00
Govert Buijs 306840fa1d Added crude filtering for browsing db 2016-06-08 23:20:27 +02:00
eolianoe d2d037fe97 Display the right short option for `--version` 2016-04-17 11:37:04 +02:00
SuperBFG7 f586db33d1 fix browsing of playlists 2016-02-16 12:03:50 +01:00
SuperBFG7 92d3806fca Merge branch 'notandt push origin mastery-master' 2016-02-14 12:34:13 +01:00
SuperBFG7 5d9a4831d4 Merge branch 'master' of git://github.com/notandy/ympd into notandy-master 2016-02-14 12:33:57 +01:00